Changeset 35


Ignore:
Timestamp:
Mar 1, 2007 7:55:57 AM (15 years ago)
Author:
raasch
Message:

small bugfix in mbuild, subjob adjusted for RIAM machines

Location:
palm/trunk/SCRIPTS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mbuild

    r29 r35  
    14021402             echo "  *** compiling the utility programs ..."
    14031403             cd ${local_source_path}/../UTIL
    1404              make  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"
     1404             make  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"
    14051405             cd  -  > /dev/null
    14061406          fi
  • palm/trunk/SCRIPTS/subjob

    r12 r35  
    7979     # 28/11/06 - Siggi - levanto admitted
    8080     # 13/02/07 - Siggi - hpmuk releated code removed
     81     # 01/03/07 - Siggi - adjustments for RIAM machines gate and NEC-SX8 (n-sx)
    8182
    8283
     
    147148     (cs*)                   local_addres=136.172.44.131; local_host=nech;;
    148149     (elephanta)             local_addres=130.75.105.6;   local_host=lcmuk;;
     150     (gate|n-sx)             local_addres=133.5.178.11;   local_host=neck;;
    149151     (gfdl5)                 local_addres=165.132.26.58;  local_host=ibmy;;
    150152     (gfdl3.yonsei.ac.kr)    local_addres=165.132.26.56;  local_host=decalpha;;
     
    218220    printf "\n        -h    execution host, available hosts:    $remote_host"
    219221    printf "\n              ibm, ibmb, ibmh, ibms, ibmy, lcmuk,"
    220     printf "\n              unics"
     222    printf "\n              lctit, nech, neck, unics"
    221223    printf "\n        -m    memory demand per process in MByte  ---"
    222224    printf "\n        -n    jobname                             <jobdatei>"
     
    288290        (lctit)  queue=test; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;
    289291        (nech)   qsubmem=memsz_job; qsubtime=cputim_job; remote_addres=136.172.44.147; submcom="/usr/local/bin/qsub";;
     292        (neck)   qsubmem=memsz_job; qsubtime=cputim_job; remote_addres=133.5.178.11; submcom="/usr/bin/nqsII/qsub";;
    290293        (vpp)    qsubmem=m; qsubtime=t; queue=vpp; remote_addres=130.75.4.130;;
    291294        (unics)  qsubmem=d; qsubtime=t; queue=unics; remote_addres=130.75.6.1;;
     
    414417 done
    415418
    416  if [[ $remote_host = nech ]]
     419 if [[ $remote_host = nech  ||  $remote_host = neck ]]
    417420 then
    418421    if (( tasks_per_node != 0 ))
     
    642645    fi
    643646
     647 elif [[ $remote_host = neck ]]
     648 then
     649
     650    if (( nodes > 1 ))
     651    then
     652       cat > $job_to_send << %%END%%
     653#!/bin/ksh
     654#PBS -l cpunum_prc=$tasks_per_node,cputim_job=$cputime
     655#PBS -l ${qsubmem}=${Memory}gb
     656#PBS -b $nodes
     657#PBS -o $remote_dayfile
     658#PBS -N palm
     659#PBS -j o
     660#PBS -T mpisx
     661
     662%%END%%
     663
     664    elif [[ $numprocs != 0 ]]
     665    then
     666       cat > $job_to_send << %%END%%
     667#!/bin/ksh
     668#PBS -q ${queue}
     669#PBS -l cpunum_prc=$tasks_per_node,cputim_job=$cputime
     670#PBS -l ${qsubmem}=${Memory}gb
     671#PBS -o $remote_dayfile
     672#PBS -N palm
     673#PBS -j o
     674#PBS -T mpisx
     675
     676%%END%%
     677
     678    else
     679       cat > $job_to_send << %%END%%
     680#!/bin/ksh
     681#PBS -l ${qsubmem}=${Memory}gb,${qsubtime}=$cputime
     682#PBS -o $remote_dayfile
     683#PBS -j o
     684
     685%%END%%
     686
     687    fi
     688
    644689 elif [[ $remote_host = lctit ]]
    645690 then
     
    679724    echo "trap '"                               >>  $job_to_send
    680725    echo "set +vx"                              >>  $job_to_send
    681     if [[ $(echo $remote_host | cut -c1-3) = ibm  ||  $remote_host = nech  ||  $remote_host = lctit ]]
     726    if [[ $(echo $remote_host | cut -c1-3) = ibm  ||  $(echo $remote_host | cut -c1-3) = nec  ||  $remote_host = lctit ]]
    682727    then
    683728       if [[ $remote_host = ibmb  ||  $remote_host = ibmh ]]
     
    693738       then
    694739          return_queue=default
    695        elif [[ $remote_host = t3eb ]]
    696        then
    697           return_queue=berte
    698        elif [[ $remote_host = t3ej2  ||  $remote_host = t3ej5 ]]
    699        then
    700           return_queue=normal
    701        elif [[ $remote_host = t3es ]]
    702        then
    703           return_queue=batch
     740       elif [[ $remote_host = neck ]]
     741       then
     742          return_queue=S
    704743       else
    705744          return_queue=unknown
     
    737776          echo "set -x"                            >>  $job_to_send
    738777          echo "cd /pf/b/${remote_user}/job_queue" >>  $job_to_send
     778          echo "batch_scp  -d  -w 10  -u $local_user $local_addres  $remote_dayfile  \"$job_catalog\"  $local_dayfile"  >>  $job_to_send
     779          echo "[[ \"\$for_subjob_to_do\" != \"\" ]]  &&  eval \$for_subjob_to_do"  >>  $job_to_send
     780          echo "%%END%%"                           >>  $job_to_send
     781
     782       elif [[ $remote_host = neck ]]
     783       then
     784          echo "cat > scpjob.$kennung << %%END%%"  >>  $job_to_send
     785          echo "#PBS -q $return_queue"             >>  $job_to_send
     786          echo "#PBS -l ${qsubmem}=1GB,${qsubtime}=100"  >>  $job_to_send
     787          echo "#PBS -o last_job_transfer_protocol"      >>  $job_to_send
     788          echo "#PBS -j o"                         >>  $job_to_send
     789          echo " "                                 >>  $job_to_send
     790          echo "set -x"                            >>  $job_to_send
    739791          echo "batch_scp  -d  -w 10  -u $local_user $local_addres  $remote_dayfile  \"$job_catalog\"  $local_dayfile"  >>  $job_to_send
    740792          echo "[[ \"\$for_subjob_to_do\" != \"\" ]]  &&  eval \$for_subjob_to_do"  >>  $job_to_send
Note: See TracChangeset for help on using the changeset viewer.