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

Changeset 1356


Ignore:
Timestamp:
2009-03-31T11:09:13+02:00 (15 years ago)
Author:
cetlod
Message:

Modifying scripts to take into account TOP/PISCES ref config in NVTK, see ticket:386

Location:
trunk/NVTK
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/NVTK/INSTALL/CONFIG_FILES/AA_make

    r1301 r1356  
    44ioipsl: 
    55#-Q- sx8brodie (cd ../../modeles/IOIPSL/src; sxgmake;) 
     6#-Q- sx8mercure   (cd ../../modeles/IOIPSL/src; sxgmake;) 
    67#-Q- aix6   (cd ../../modeles/IOIPSL/src; gmake;) 
    78#-Q- osxxlf (cd ../../modeles/IOIPSL/src; gmake;) 
    … …  
    1516ifneq ($(JOB),nojob) 
    1617   cp ../NVTK/INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh 
     18   cp ../NVTK/INSTALL/JOBS/LOBSTER_stat.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/LOBSTER_stat.ksh 
     19   cp ../NVTK/INSTALL/JOBS/PISCES_stat.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/PISCES_stat.ksh 
    1720   cp -p ../NVTK/INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh 
    1821   cp -p ../NVTK/INSTALL/JOBS/assessment.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/assessment.ksh 
    … …  
    2326#-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/CPU_time_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8brodie.ksh 
    2427#-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/MEM_size_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8brodie.ksh 
    25 #-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/BIO_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_sx8brodie.ksh 
     28#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/jhd_sx8mercure_mon  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_sx8mercure_mon 
     29#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/CPU_time_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8mercure.ksh 
     30#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/MEM_size_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8mercure.ksh 
    2631#-Q- aix6   cp ../NVTK/INSTALL/JOBS/jhd_ax6_mono_mon  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_ax6_mono_mon 
    2732#-Q- aix6   cp ../NVTK/INSTALL/JOBS/CPU_time_aix6.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_aix6.ksh 
    2833#-Q- aix6   cp ../NVTK/INSTALL/JOBS/MEM_size_aix6.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_aix6.ksh 
    29 #-Q- aix6   cp ../NVTK/INSTALL/JOBS/BIO_aix6.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_aix6.ksh 
    3034#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/jhd_osxxlf_mon  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_osxxlf_mon 
    3135#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh 
    3236#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh 
    33 #-Q- osxxlf cp ../NVTK/INSTALL/JOBS/BIO_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_osxxlf.ksh 
    3437   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) ; ) 
    3538endif 
    … …  
    4346ifneq ($(JOB),nojob) 
    4447   cp ../NVTK/INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh 
     48   cp ../NVTK/INSTALL/JOBS/LOBSTER_stat.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/LOBSTER_stat.ksh 
     49   cp ../NVTK/INSTALL/JOBS/PISCES_stat.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/PISCES_stat.ksh 
    4550   cp -p ../NVTK/INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh 
    4651   cp -p ../NVTK/INSTALL/JOBS/assessment.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/assessment.ksh 
    … …  
    5156#-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/CPU_time_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8brodie.ksh 
    5257#-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/MEM_size_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8brodie.ksh 
    53 #-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/BIO_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_sx8brodie.ksh 
     58#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/jhd_sx8mercure_omp  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_sx8mercure_omp 
     59#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/CPU_time_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8mercure.ksh 
     60#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/MEM_size_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8mercure.ksh 
    5461   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) ; ) 
    5562endif 
    … …  
    7077ifneq ($(JOB),nojob) 
    7178   cp ../NVTK/INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh 
     79   cp ../NVTK/INSTALL/JOBS/LOBSTER_stat.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/LOBSTER_stat.ksh 
     80   cp ../NVTK/INSTALL/JOBS/PISCES_stat.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/PISCES_stat.ksh 
    7281   cp -p ../NVTK/INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh 
    7382   cp -p ../NVTK/INSTALL/JOBS/assessment.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/assessment.ksh 
    … …  
    7887#-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/CPU_time_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8brodie.ksh 
    7988#-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/MEM_size_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8brodie.ksh 
    80 #-Q- sx8brodie cp ../NVTK/INSTALL/JOBS/BIO_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_sx8brodie.ksh 
     89#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/jhd_sx8mercure_mpi  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_sx8mercure_mpi 
     90#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/CPU_time_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8mercure.ksh 
     91#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/MEM_size_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8mercure.ksh 
    8192#-Q- aix6   cp ../NVTK/INSTALL/JOBS/jhd_aix6_mpi  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_aix6_mpi 
    8293#-Q- aix6   cp ../NVTK/INSTALL/JOBS/CPU_time_aix6.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_aix6.ksh 
    8394#-Q- aix6   cp ../NVTK/INSTALL/JOBS/MEM_size_aix6.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_aix6.ksh 
    84 #-Q- aix6   cp ../NVTK/INSTALL/JOBS/BIO_aix6.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_aix6.ksh 
    8595#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/jhd_osxxlf_mpi  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/jhd_osxxlf_mpi 
    8696#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh 
    8797#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh 
    88 #-Q- osxxlf cp ../NVTK/INSTALL/JOBS/BIO_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_osxxlf.ksh 
    8998   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) ; ) 
    9099endif 

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

    r1301 r1356  
    7272REV_USE=$( (awk '/Revision:/ {print $2}' specifs.txt) ) 
    7373TITLE="NEMO VALIDATION ${EXPER} : $CONF on $TARGET" 
    74 EMAIL='ctlod@locean-ipsl.upmc.fr' 
     74EMAIL='cethe@lsce.ipsl.fr' 
    7575 
    7676\rm endjob.txt 2> /dev/null 
    … …  
    477477 
    478478    if [ ${runt} != 'mon' ] ; then 
    479         echo "                                                    " >> endjob.txt 
    480         echo "   ---> Reproductibility mon .vs. ${runt} ? :       " >> endjob.txt 
    481         echo "        -------------------------------------       " >> endjob.txt 
    482  
    483         filemon="mon/LONG/${EXPER}/solver.stat" ;  filexxx="${runt}/LONG/${EXPER}/solver.stat" 
    484         xfilemon=0 
    485  
    486         checkfile ${filemon} 'endjob.txt' NORM yes yes ; xfilemon=$? 
    487         checkfile ${filexxx} 'endjob.txt' NORM no  yes ; xfilemon=$? 
     479 
     480        if  [ ${CONF} != 'ORCA2_OFF_PISCES' ] ; then 
     481           echo "                                                          " >> endjob.txt 
     482           echo "   ---> Ocean Reproductibility mon .vs. ${runt} ? :       " >> endjob.txt 
     483           echo "        -------------------------------------------       " >> endjob.txt 
     484 
     485           filemon="mon/LONG/${EXPER}/solver.stat" ;  filexxx="${runt}/LONG/${EXPER}/solver.stat" 
     486           xfilemon=0 
     487 
     488           checkfile ${filemon} 'endjob.txt' NORM yes yes ; xfilemon=$? 
     489           checkfile ${filexxx} 'endjob.txt' NORM no  yes ; xfilemon=$? 
    488490         
    489         mak_diff_file -x ${xfilemon} -a ${filemon} -b ${filexxx} -r ${runt} -s LONG -k repro 
     491           mak_diff_file -x ${xfilemon} -a ${filemon} -b ${filexxx} -r ${runt} -s LONG -k repro 
     492        fi 
    490493         
    491         if [ ${CONF} = 'GYRE_LOBSTER' ] ; then 
    492             echo "                                                    " >> endjob.txt 
    493             echo "   ---> BIO Reproductibility mon .vs. ${runt} ? :   " >> endjob.txt 
    494             echo "        -----------------------------------------   " >> endjob.txt 
    495  
     494        if [ ${CONF} = 'GYRE_LOBSTER' -o ${CONF} = 'ORCA2_LIM_PISCES' -o ${CONF} = 'ORCA2_OFF_PISCES' ] ; then 
    496495            # check that ocean.output files exist 
    497496            filemon="mon/LONG/${EXPER}/ocean.output" ;  filexxx="${runt}/LONG/${EXPER}/ocean.output" 
    … …  
    504503            filemon="mon/LONG/${EXPER}/tracer.stat" ;  filexxx="${runt}/LONG/${EXPER}/tracer.stat" 
    505504            xfilemon=0 
    506              
    507             ./BIO_${TARGET}.ksh -a ${filemon} -b ${filexxx} -c ocean.output 
     505            if [ ${CONF} = 'GYRE_LOBSTER' ] ; then 
     506               echo "                                                        " >> endjob.txt 
     507               echo "   ---> LOBSTER Reproductibility mon .vs. ${runt} ? :   " >> endjob.txt 
     508               echo "        ---------------------------------------------   " >> endjob.txt 
     509 
     510               ./LOBSTER_stat.ksh -a ${filemon} -b ${filexxx} -c ocean.output 
     511            else 
     512               echo "                                                        " >> endjob.txt 
     513               echo "   ---> PISCES  Reproductibility mon .vs. ${runt} ? :   " >> endjob.txt 
     514               echo "        ---------------------------------------------   " >> endjob.txt 
     515 
     516               ./PISCES_stat.ksh -a ${filemon} -b ${filexxx} -c ocean.output 
     517            fi 
    508518 
    509519            checkfile ${filemon} 'endjob.txt' NORM yes ; xfilemon=$? 
    … …  
    527537 
    528538for runt in ${LRTYPE} ; do 
    529  
    530     echo "                                                    " >> endjob.txt 
    531     echo "   ---> ${runt} restartability ? :                  " >> endjob.txt 
    532     echo "        --------------------------                  " >> endjob.txt 
    533  
    534     file1="${runt}/1_SHORT/${EXPER}/solver.stat" ;  file2="${runt}/2_SHORT/${EXPER}/solver.stat" ; file3="${runt}/LONG/${EXPER}/solver.stat" 
    535     xfile1=0 
     539    if  [ ${CONF} != 'ORCA2_OFF_PISCES' ] ; then 
     540       echo "                                                          " >> endjob.txt 
     541       echo "   ---> ${runt} ocean restartability ? :                  " >> endjob.txt 
     542       echo "        --------------------------------                  " >> endjob.txt 
     543 
     544       file1="${runt}/1_SHORT/${EXPER}/solver.stat" ;  file2="${runt}/2_SHORT/${EXPER}/solver.stat" ; file3="${runt}/LONG/${EXPER}/solver.stat" 
     545       xfile1=0 
     546       #------- 
     547       checkfile ${file1} 'endjob.txt' NORM yes yes ; xfile1=$? 
     548       checkfile ${file2} 'endjob.txt' NORM no  yes ; xfile1=$? 
     549       # 
     550       cat ${file1} ${file2}  > short_solver_${runt}.stat 
     551       mak_diff_file -x ${xfile1} -a ${file3} -b short_solver_${runt}.stat -r ${runt} -k resta 
     552       \rm short_solver_${runt}.stat 
     553    fi  
    536554    #------- 
    537     checkfile ${file1} 'endjob.txt' NORM yes yes ; xfile1=$? 
    538     checkfile ${file2} 'endjob.txt' NORM no  yes ; xfile1=$? 
    539     # 
    540     cat ${file1} ${file2}  > short_solver_${runt}.stat 
    541     mak_diff_file -x ${xfile1} -a ${file3} -b short_solver_${runt}.stat -r ${runt} -k resta 
    542     \rm short_solver_${runt}.stat 
    543      
    544     #------- 
    545  
    546     if [ ${CONF} = 'GYRE_LOBSTER' ] ; then 
    547         echo "                                                    " >> endjob.txt 
    548         echo "   ---> ${runt} BIO restartability ? :              " >> endjob.txt 
    549         echo "        ------------------------------              " >> endjob.txt 
     555 
     556    if [ ${CONF} = 'GYRE_LOBSTER' -o ${CONF} = 'ORCA2_LIM_PISCES' -o ${CONF} = 'ORCA2_OFF_PISCES' ] ; then 
    550557 
    551558       # check that ocean.output files exist 
    … …  
    560567        xfile1=0 
    561568 
    562         ./BIO_${TARGET}.ksh -a ${file1} -b ${file2} -c ocean.output 
     569        if [ ${CONF} = 'GYRE_LOBSTER' ] ; then 
     570           echo "                                                        " >> endjob.txt 
     571           echo "   ---> ${runt} LOBSTER restartability ? :              " >> endjob.txt 
     572           echo "        ----------------------------------              " >> endjob.txt 
     573 
     574           ./LOBSTER_stat.ksh -a ${file1} -b ${file2} -c ocean.output 
     575        else 
     576           echo "                                                        " >> endjob.txt 
     577           echo "   ---> ${runt} PISCES  restartability ? :              " >> endjob.txt 
     578           echo "        ---------------------------------------------   " >> endjob.txt 
     579 
     580           ./PISCES_stat.ksh -a ${file1} -b ${file2} -c ocean.output 
     581        fi 
     582 
    563583 
    564584        checkfile ${file1} 'endjob.txt' NORM yes ; xfile1=$? 

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

    r1301 r1356  
    1717 
    1818CONF=$1 
     19CONFS=$2 
    1920LJOBS=qstat 
    20  
    21 if [ ${CONF} == 'ORCA2_LIM' ] ; then 
    22 CONFS=ORCA2 
    23 elif [ ${CONF} == 'GYRE_LOBSTER' ] ; then 
    24 CONFS=GYRE_ 
    25 elif [ ${CONF} == 'ZAGRIF' ] ; then 
    26 CONFS=ZAGRI 
    27 else 
    28 CONFS=${CONF} 
    29 fi 
    3021 
    3122JOBS_LIST=` ${LJOBS} |  grep -c ${CONFS}` 
    … …  
    3728fi 
    3829sleep 300 
    39 ./cron_jobs.ksh ${CONF} & 
     30./cron_jobs.ksh ${CONF} ${CONFS} & 
    4031exit 
    4132 

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

    r1321 r1356  
    5959# PRC       : total number of processors which will be used 
    6060########################################################## 
    61 IODIR=/Volumes/FENUA/ORCA2_LIM_nemo_v2_IO 
     61IODIR=/u/rech/eee/reee512/NEMO/ 
    6262PRC=8 
    63 TARGET=osxxlf 
     63TARGET=sx8brodie 
    6464########################################################## 
    6565##### End   Users modifications 
    … …  
    135135#     Adapt header (batch jobs) and concatanate it with core job 
    136136# -------------------------------------------------------------- 
     137if [ ${CONF} == 'ORCA2_LIM' ] ; then 
     138CONFS=ORCA2 
     139elif [ ${CONF} == 'GYRE' ] ; then 
     140CONFS=GYREO 
     141elif [ ${CONF} == 'GYRE_LOBSTER' ] ; then 
     142CONFS=GYREL 
     143elif [ ${CONF} == 'ORCA2_LIM_PISCES' ] ; then 
     144CONFS=OR2LP 
     145elif [ ${CONF} == 'ORCA2_OFF_PISCES' ] ; then 
     146CONFS=OR2OP 
     147elif [ ${CONF} == 'ZAGRIF' ] ; then 
     148CONFS=ZAGRI 
     149else 
     150CONFS=${CONF} 
     151fi 
     152 
    137153case ${TARGET} in 
    138154     'osxxlf' ) 
    … …  
    140156     'ax6_mono' ) 
    141157          CAR_JNAM=$( grep '\# @ job_name' jhd_${TARGET}_${RUN} ) 
    142           sed    -e "s%$CAR_JNAM%\# @ job_name = ${RUN}${CONF}%" \ 
     158          sed    -e "s%$CAR_JNAM%\# @ job_name = ${RUN}${CONFS}%" \ 
    143159          jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp  ;; 
    144160     'aix6' ) 
    145161          CAR_JNAM=$( grep '\# @ job_name' jhd_${TARGET}_${RUN} ) 
    146162          CAR_JMPI=$( grep '\# @ total_tasks' jhd_${TARGET}_${RUN} ) 
    147           sed    -e "s%$CAR_JNAM%\# @ job_name = ${RUN}${CONF}%" \ 
     163          sed    -e "s%$CAR_JNAM%\# @ job_name = ${RUN}${CONFS}%" \ 
    148164          -e "s%$CAR_JMPI%\# @ total_tasks = ${PRC}%" \ 
    149165          jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp  ;; 
    … …  
    154170          if [ ${RUN} = 'mpi' -o ${RUN} = 'omp' ] ; then 
    155171              CAR_JMPI=$( grep '\#PBS -l cpunum_job' jhd_${TARGET}_${RUN} ) 
    156               sed    -e "s%$CAR_JNAM%\#PBS -N  ${RUN}${CONF}%" \ 
    157               -e "s%$CAR_JNAMO%\#PBS -o  ${RUN}${CONF}_std%" \ 
    158               -e "s%$CAR_JNAME%\#PBS -e  ${RUN}${CONF}_err%" \ 
     172              sed    -e "s%$CAR_JNAM%\#PBS -N  ${RUN}${CONFS}%" \ 
     173              -e "s%$CAR_JNAMO%\#PBS -o  ${RUN}${CONFS}_std%" \ 
     174              -e "s%$CAR_JNAME%\#PBS -e  ${RUN}${CONFS}_err%" \ 
    159175              -e "s%$CAR_JMPI%\#PBS -l cpunum_job=${PRC}%" \ 
    160176              jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 
    161177          else 
    162               sed    -e "s%$CAR_JNAM%\#PBS -N  ${RUN}${CONF}%" \ 
    163               -e "s%$CAR_JNAMO%\#PBS -o  ${RUN}${CONF}_std%" \ 
    164               -e "s%$CAR_JNAME%\#PBS -e  ${RUN}${CONF}_err%" \ 
     178              sed    -e "s%$CAR_JNAM%\#PBS -N  ${RUN}${CONFS}%" \ 
     179              -e "s%$CAR_JNAMO%\#PBS -o  ${RUN}${CONFS}_std%" \ 
     180              -e "s%$CAR_JNAME%\#PBS -e  ${RUN}${CONFS}_err%" \ 
    165181              jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 
    166182          fi ;; 
    … …  
    296312 
    297313    if [ ${TARGET} != 'osxxlf' ]; then 
    298         ./cron_jobs.ksh ${CONF} & 
     314        ./cron_jobs.ksh ${CONF} ${CONFS} & 
    299315    fi 
    300316fi 

  • trunk/NVTK/INSTALL/ins_nvtk.ksh

    r1302 r1356  
    6262 
    6363# Standard configurations 
    64 NBCFG=4 
     64NBCFG=6 
    6565CONF[0]=ORCA2_LIM 
    6666CONF[1]=GYRE 
    6767CONF[2]=GYRE_LOBSTER 
    68 CONF[3]=ZAGRIF 
     68CONF[3]=ORCA2_LIM_PISCES 
     69CONF[4]=ORCA2_OFF_PISCES 
     70CONF[5]=ZAGRIF 
    6971LCLDIR=`pwd` 
    7072 

  • trunk/NVTK/Makefile

    r1321 r1356  
    3131#- 
    3232#- Configurations list which must be tested 
    33 LISTE_CONF = GYRE GYRE_LOBSTER ORCA2_LIM 
     33LISTE_CONF = GYRE GYRE_LOBSTER ORCA2_LIM ORCA2_LIM_PISCES ORCA2_OFF_PISCES 
    3434#- 
    3535#- Jobs to launch use keyword: nojob, all, long, short or gtime 

  • trunk/NVTK/cfg.txt

    r1136 r1356  
    33ZAGRIF OPA_SRC LIM_SRC_2 C1D_SRC NST_SRC 
    44GYRE_LOBSTER OPA_SRC LIM_SRC_2 C1D_SRC TOP_SRC 
    5  
     5ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 C1D_SRC TOP_SRC 
     6ORCA2_OFF_PISCES OFF_SRC TOP_SRC 
Note: See TracChangeset for help on using the changeset viewer.