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

Changeset 815


Ignore:
Timestamp:
2008-02-08T16:33:44+01:00 (16 years ago)
Author:
ctlod
Message:

dev_001_SBC: Merge of VALID/HEAD directories with the trunk -r 731:HEAD

Location:
branches/dev_001_SBC/VALID
Files:
10 edited
5 copied

Legend:

Unmodified
Added
Removed

  • branches/dev_001_SBC/VALID/2INSTALL/CONFIG_FILES/AA_make

    r698 r815  
    1212 
    1313   cp ../../bin/opa_$(NEMOLIB)_$@  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@ 
     14ifneq ($(JOB),nojob) 
    1415   cp ../VALID/2INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh 
    1516   cp -p ../VALID/2INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh 
    … …  
    2021#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/CPU_time_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8brodie.ksh 
    2122#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/MEM_size_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8brodie.ksh 
     23#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/BIO_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_sx8brodie.ksh 
    2224#-Q- aix cp ../VALID/2INSTALL/JOBS/jhd_ax_mono_mon  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_ax_mono_mon 
    2325#-Q- aix cp ../VALID/2INSTALL/JOBS/CPU_time_aix.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_aix.ksh 
    2426#-Q- aix cp ../VALID/2INSTALL/JOBS/MEM_size_aix.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_aix.ksh 
     27#-Q- aix cp ../VALID/2INSTALL/JOBS/BIO_aix.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_aix.ksh 
    2528#-Q- osxxlf cp ../VALID/2INSTALL/JOBS/jhd_osxxlf_mon  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_osxxlf_mon 
    2629#-Q- osxxlf cp ../VALID/2INSTALL/JOBS/CPU_time_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh 
    2730#-Q- osxxlf cp ../VALID/2INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh 
    28    ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(RTG) ; ) 
     31#-Q- osxxlf cp ../VALID/2INSTALL/JOBS/BIO_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_osxxlf.ksh 
     32   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(JOB) $(MKTE) $(RTG) ; ) 
     33endif 
    2934 
    3035omp: mpi 
    … …  
    3439 
    3540   cp ../../bin/opa_$(NEMOLIB)_$@  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@ 
     41ifneq ($(JOB),nojob) 
    3642   cp ../VALID/2INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh 
    3743   cp -p ../VALID/2INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh 
    … …  
    4248#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/CPU_time_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8brodie.ksh 
    4349#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/MEM_size_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8brodie.ksh 
    44    ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(RTG) ; ) 
     50#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/BIO_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_sx8brodie.ksh 
     51   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(JOB) $(MKTE) $(RTG) ; ) 
     52endif 
     53 
    4554else 
    4655   @echo 'No omp compilation' 
    … …  
    5665 
    5766   cp ../../bin/opa_$(NEMOLIB)_$@  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@ 
     67ifneq ($(JOB),nojob) 
    5868   cp ../VALID/2INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh 
    5969   cp -p ../VALID/2INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh 
    … …  
    6474#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/CPU_time_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8brodie.ksh 
    6575#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/MEM_size_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8brodie.ksh 
     76#-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/BIO_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_sx8brodie.ksh 
    6677#-Q- aix cp ../VALID/2INSTALL/JOBS/jhd_aix_mpi  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_aix_mpi 
    6778#-Q- aix cp ../VALID/2INSTALL/JOBS/CPU_time_aix.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_aix.ksh 
    6879#-Q- aix cp ../VALID/2INSTALL/JOBS/MEM_size_aix.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_aix.ksh 
     80#-Q- aix cp ../VALID/2INSTALL/JOBS/BIO_aix.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_aix.ksh 
    6981#-Q- osxxlf cp ../VALID/2INSTALL/JOBS/jhd_osxxlf_mpi  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_osxxlf_mpi 
    7082#-Q- osxxlf cp ../VALID/2INSTALL/JOBS/CPU_time_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh 
    7183#-Q- osxxlf cp ../VALID/2INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh 
    72    ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(RTG) ; ) 
     84#-Q- osxxlf cp ../VALID/2INSTALL/JOBS/BIO_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_osxxlf.ksh 
     85   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(JOB) $(MKTE) $(RTG) ; ) 
     86endif 
    7387 
    7488else 
    … …  
    8195memo: 
    8296#-Q- aix ../../util/ins_make -t ax_mono -w $(NEMOLIB)/WORK 
     97ifeq ($(MKMO),memo) 
     98   then  
    8399   gmake -C WORK COMP=$@ clean > $(NEMOLIB)_logbook_$@.txt 
    84100   gmake -C WORK COMP=$@ >> $(NEMOLIB)_logbook_$@.txt 
    85101 
    86102   cp ../../bin/opa_$(NEMOLIB)_$@  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@ 
     103else 
     104   @echo 'No memory check' 
     105endif 
    87106 

  • branches/dev_001_SBC/VALID/2INSTALL/CONFIG_FILES/AA_make.ldef

    r695 r815  
    1010NEMOLIB := $(shell awk '{ print $$1 }' ./WORK/.config) 
    1111RUN= 
     12JOB= 
    1213RTG= 
    1314MKTE= 
     15MKMO= 
    1416WWDIR=/Users/ctlod/WORK/AZE/modipsl/config 
    1517#--------------------------------------------------------------------- 

  • branches/dev_001_SBC/VALID/2INSTALL/JOBS/assessment.ksh

    r695 r815  
    435435         
    436436        mak_diff_file -x ${xfilemon} -a ${filemon} -b ${filexxx} -r ${runt} -s LONG -k repro 
     437         
     438        if [ ${CONF} = 'GYRE_LOBSTER' ] ; then 
     439            echo "                                                    " >> endjob.txt 
     440            echo "   ---> BIO Reproductibility mon .vs. ${runt} ? :   " >> endjob.txt 
     441            echo "        -----------------------------------------   " >> endjob.txt 
     442 
     443            # check that ocean.output files exist 
     444            filemon="mon/LONG/ocean.output" ;  filexxx="${runt}/LONG/ocean.output" 
     445            xfilemon=0 
     446 
     447            checkfile ${filemon} 'endjob.txt' NORM yes ; xfilemon=$? 
     448            checkfile ${filexxx} 'endjob.txt' NORM ; xfilemon=$? 
     449             
     450            # check that tracer.stat files have been built based on ocean.output ones 
     451            filemon="mon/LONG/tracer.stat" ;  filexxx="${runt}/LONG/tracer.stat" 
     452            xfilemon=0 
     453             
     454            ./BIO_${TARGET}.ksh -a ${filemon} -b ${filexxx} -c ocean.output 
     455 
     456            checkfile ${filemon} 'endjob.txt' NORM yes ; xfilemon=$? 
     457            checkfile ${filexxx} 'endjob.txt' NORM ; xfilemon=$? 
     458             
     459            mak_diff_file -x ${xfilemon} -a ${filemon} -b ${filexxx} -r ${runt} -s LONG -k repro 
     460        fi 
    437461    fi 
    438462done 
    … …  
    466490     
    467491    #------- 
     492 
     493    if [ ${CONF} = 'GYRE_LOBSTER' ] ; then 
     494        echo "                                                    " >> endjob.txt 
     495        echo "   ---> ${runt} BIO restartability ? :              " >> endjob.txt 
     496        echo "        ------------------------------              " >> endjob.txt 
     497 
     498       # check that ocean.output files exist 
     499        file1="${runt}/2_SHORT/ocean.output" ;  file2="${runt}/LONG/ocean.output" 
     500        xfile1=0 
     501 
     502        checkfile ${file1} 'endjob.txt' NORM yes ; xfile1=$? 
     503        checkfile ${file2} 'endjob.txt' NORM     ; xfile1=$? 
     504             
     505        # check that tracer.stat files have been built based on ocean.output ones 
     506        file1="${runt}/2_SHORT/tracer.stat" ;  file2="${runt}/LONG/tracer.stat" 
     507        xfile1=0 
     508 
     509        ./BIO_${TARGET}.ksh -a ${file1} -b ${file2} -c ocean.output 
     510 
     511        checkfile ${file1} 'endjob.txt' NORM yes ; xfile1=$? 
     512        checkfile ${file2} 'endjob.txt' NORM     ; xfile1=$? 
     513        # 
     514        mak_diff_file -x ${xfile1} -a ${file2} -b ${file1} -r ${runt} -k resta 
     515 
     516    fi 
     517     
    468518done 
    469519 

  • branches/dev_001_SBC/VALID/2INSTALL/JOBS/cron_jobs.ksh

    r695 r815  
    2020if [ ${CONF} == 'ORCA2_LIM' ] ; then 
    2121CONFS=ORCA2 
     22elif [ ${CONF} == 'GYRE_LOBSTER' ] ; then 
     23CONFS=GYRE_ 
    2224elif [ ${CONF} == 'ZAGRIF' ] ; then 
    2325CONFS=ZAGRI 

  • branches/dev_001_SBC/VALID/2INSTALL/JOBS/job_GYRE.ksh

    r695 r815  
    234234if [ $type = '1_short' ] ; then 
    235235    cd ${WORK}/NEMO_VALID/W${CONF}/${RUN}/2_SHORT 
    236     ${LAUNCH} job_${RUN}_2_short.ksh 
     236    ${LAUNCH}job_${RUN}_2_short.ksh 
    237237fi 

  • branches/dev_001_SBC/VALID/2INSTALL/JOBS/job_ORCA2_LIM.ksh

    r695 r815  
    251251if [ $type = '1_short' ] ; then 
    252252    cd ${WORK}/NEMO_VALID/W${CONF}/${RUN}/2_SHORT 
    253     ${LAUNCH} job_${RUN}_2_short.ksh 
     253    ${LAUNCH}job_${RUN}_2_short.ksh 
    254254fi 

  • branches/dev_001_SBC/VALID/2INSTALL/JOBS/job_ZAGRIF.ksh

    r695 r815  
    280280if [ $type = '1_short' ] ; then 
    281281    cd ${WORK}/NEMO_VALID/W${CONF}/${RUN}/2_SHORT 
    282     ${LAUNCH} job_${RUN}_2_short.ksh 
     282    ${LAUNCH}job_${RUN}_2_short.ksh 
    283283fi 

  • branches/dev_001_SBC/VALID/2INSTALL/JOBS/lance_batch.ksh

    r695 r815  
    44# Contact  : opatlod@locean-ipsl.upmc.fr 
    55# 
    6 # INPUT ARGS: 2 + 1 optional 
     6# INPUT ARGS: 3 + 1 optional 
    77#     - CONF  : configuration name (ORCA2_LIM, GYRE ..) 
    88#     - MTIME : timing/no timing (timing or notiming) 
    9 #     - REFTAG (optional): reference tag name to which current  
    10 #              version will be compare to 
     9#     - JOBTOL: jobs to launch: all, long, 1_short or gtime 
     10#     - REFTAG: (optional): reference tag name to which current  
     11#               version will be compare to 
    1112# 
    1213# WORK: This script aims to (for each standard configuration) : 
    … …  
    6566CONF=$1 
    6667MTIME=$2 
    67 REFTAG=$3 
     68JOBTOL=$3 
     69REFTAG=$4 
    6870RUN=$(basename `pwd`) 
    6971 
    … …  
    7779if   [ ${TARGET} = 'sx8brodie' ]; then 
    7880    W_XX='#-T- sx8brodie' 
    79     LAUN=qsub 
     81    LAUN='qsub ' 
    8082    LLJOBS=qstat 
    8183    LSUB="mpirun -np ${PRC}" 
    … …  
    8789elif [ ${TARGET} = 'aix' ]; then 
    8890    W_XX='#-T- aix' 
    89     LAUN=llsubmit 
     91    LAUN='llsubmit ' 
    9092    LLJOBS=Qstat 
    9193    LSUB= 
    … …  
    9799elif [ ${TARGET} = 'ax_mono' ]; then 
    98100    W_XX='#-T- ax_mono' 
    99     LAUN=llsubmit 
     101    LAUN='llsubmit ' 
    100102    LLJOBS=Qstat 
    101103    LSUB= 
    … …  
    107109elif [ ${TARGET} = 'osxxlf' ]; then 
    108110    W_XX='#-T- osxxlf' 
    109     LAUN= 
     111    LAUN='./' 
    110112    LLJOBS= 
    111113    LSUB="mpirun -np ${PRC}" 
    … …  
    178180dirjob[0]=LONG ; dirjob[1]=1_SHORT ; dirjob[2]=2_SHORT ; dirjob[3]=GTIME  
    179181 
    180 iloop=3 
    181 if [ ${MTIME} = 'timing' ] ; then iloop=4 ; fi 
    182  
    183 ind=0 
     182case ${JOBTOL} in 
     183     'all' ) 
     184              if [ ${MTIME} = 'timing' ] ; then  
     185             ind=0 ; iloop=4 ; 
     186         else 
     187             ind=0 ; iloop=3 ; 
     188              fi ;; 
     189     'long' ) 
     190              ind=0 ; iloop=1 ;; 
     191     'short' ) 
     192              ind=1 ; iloop=3 ;; 
     193     'gtime' ) 
     194              ind=3 ; iloop=4 ;; 
     195esac 
     196 
    184197while [ $ind -lt ${iloop} ] 
    185198do 
    … …  
    210223       -e "s/$CAR_RUN/RUN=$RUN/" \ 
    211224       -e "s/$CAR_MPP/NB_PROCS=$PRC/" \ 
    212        -e "s/$CAR_SUB/LAUNCH=$LAUN/" \ 
     225       -e "s@$CAR_SUB@LAUNCH='$LAUN'@" \ 
    213226       -e "s/$CAR_EXE/LEXE='$LSUB'/" \ 
    214227       -e "s/$CAR_PER/CPERF='$LPERF'/" \ 
    … …  
    238251 
    239252       chmod 750 job_${RUN}_${jobnam[$ind]}.ksh 
     253       mv job_${RUN}_${jobnam[$ind]}.ksh ${dirjob[$ind]}/. 
    240254 
    241255       if [ ${jobnam[$ind]} != '2_short' ] ; then 
    242            mv job_${RUN}_${jobnam[$ind]}.ksh ${dirjob[$ind]}/. 
    243256           cd ${dirjob[$ind]} 
    244            ${LAUN} job_${RUN}_${jobnam[$ind]}.ksh & 
     257           ${LAUN}job_${RUN}_${jobnam[$ind]}.ksh & 
    245258           cd ../ 
    246        else 
    247            mv job_${RUN}_${jobnam[$ind]}.ksh ${dirjob[$ind]}/. 
    248259       fi 
    249260 

  • branches/dev_001_SBC/VALID/2INSTALL/ins_valid.ksh

    r698 r815  
    5050########################################################## 
    5151OUTDIR=/Users/ctlod/WORK/AZE/modipsl/config 
    52 INPUTD=/Volumes/FENUA/ORCA2_LIM_nemo_v2_IO 
    53 REFDAT=/Volumes/FENUA/ORCA2_LIM_nemo_v2_IO 
     52INPUTD=/u/rech/eee/reee831/IO_NEMO_ORCA2_LIM 
     53REFDAT=/u/rech/eee/reee831/NEMO_VALIDATION 
    5454DECOMP=8 
    5555MAIL="ctlod@locean-ipsl.upmc.fr" 
    … …  
    6161 
    6262# Standard configurations 
    63 NBCFG=3 
     63NBCFG=4 
    6464CONF[0]=ORCA2_LIM 
    6565CONF[1]=GYRE 
    66 CONF[2]=ZAGRIF 
     66CONF[2]=GYRE_LOBSTER 
     67CONF[3]=ZAGRIF 
    6768LCLDIR=`pwd` 
    6869 

  • branches/dev_001_SBC/VALID/cfg.txt

    r697 r815  
    22GYRE OPA_SRC LIM_SRC C1D_SRC 
    33ZAGRIF OPA_SRC LIM_SRC C1D_SRC NST_SRC 
     4GYRE_LOBSTER OPA_SRC LIM_SRC C1D_SRC TOP_SRC 
Note: See TracChangeset for help on using the changeset viewer.