Changeset 2266 for palm/trunk/SCRIPTS/subjob

Timestamp:

Jun 9, 2017 9:27:21 AM (7 years ago)

Author:

raasch

Message:

bugfix for calculating cpu-time per gridpoint, nech related parts removed from subjob script

File:

• palm/trunk/SCRIPTS/subjob (modified) (11 diffs)

palm/trunk/SCRIPTS/subjob

@@ -28 +28 @@
 # -----------------
 # $Id$
+# nech related parts removed
+# 
+# 2257 2017-06-07 14:07:05Z witha
 # adjustments for lceddy, removed lcflow-specific code
 # 
@@ -231 +234 @@
      (climate*)              local_address=165.132.26.68;  local_host=lcyon;;
      (clogin*)               local_address=86.50.166.21;   local_host=lccrayf;;
-     (cs*)                   local_address=136.172.44.131; local_host=nech;;
      (elephanta)             local_address=130.75.105.6;   local_host=lcmuk;;
      (hpcl*)                 local_address=eddy.hpc.uni-oldenburg.de; local_host=lceddy;;
@@ -334 +336 @@
     printf "\n        -h    execution host, available hosts:    $remote_host"
     printf "\n              ibm, ibmh, ibmkisti, ibmku, ibms, lc...,"
-    printf "\n              lckiaps, lctit, nech"
+    printf "\n              lckiaps, lctit"
     printf "\n        -m    memory demand per process in MByte  ---"
     printf "\n        -n    jobname                             <jobdatei>"
@@ -420 +422 @@
         (lcxt5m)  remote_address=193.166.211.144; submcom=/opt/pbs/10.1.0.91350/bin/qsub;;
         (lcyon)   remote_address=165.132.26.68; submcom=/usr/torque/bin/qsub;;
-        (nech)    qsubmem=memsz_job; qsubtime=cputim_job; remote_address=136.172.44.147; submcom="/usr/local/bin/qsub";;
         (*)       printf "\n  +++ hostname \"$remote_host\" not allowed";
                   locat=parameter; exit;;
@@ -536 +537 @@
     fi
  done
- if [[ $remote_host = nech ]]
- then
-    if (( tasks_per_node != 0 ))
-    then
-       (( cputime = cputime * tasks_per_node ))
-    elif [[ $numprocs != 0 ]]
-    then
-       (( cputime = cputime * numprocs ))
-    fi
- fi
  (( stunden  = cputime / 3600 ))
  (( resttime = cputime - stunden * 3600 ))
@@ -569 +560 @@
  done
 
- if [[ $remote_host = nech ]]
- then
-    if (( tasks_per_node != 0 ))
-    then
-       (( Memory = memory * tasks_per_node / 1000 ))
-    elif [[ $numprocs != 0 ]]
-    then
-       (( Memory = memory * numprocs / 1000 ))
-    else
-       (( Memory = memory / 1000 ))
-    fi
- elif [[ $remote_host = lctit ]]
+ if [[ $remote_host = lctit ]]
  then
     (( Memory = memory * tasks_per_node / 1000 ))
@@ -1204 +1184 @@
 %%END%%
 
- elif [[ $remote_host = nech ]]
- then
-
-    if (( nodes > 1 ))
-    then
-       cat > $job_to_send << %%END%%
-#!/bin/ksh
-#PBS -l cpunum_prc=$processes_per_node,cputim_job=$cputime
-#PBS -l ${qsubmem}=${Memory}gb
-#PBS -b $nodes
-#PBS -o $remote_dayfile
-#PBS -N palm
-#PBS -j o
-#PBS -T mpisx
-
-%%END%%
-
-    elif [[ $numprocs != 0 ]]
-    then
-       cat > $job_to_send << %%END%%
-#!/bin/ksh
-#PBS -l cpunum_prc=$processes_per_node,cputim_job=$cputime
-#PBS -l ${qsubmem}=${Memory}gb
-#PBS -o $remote_dayfile
-#PBS -N palm
-#PBS -j o
-
-%%END%%
-
-    else
-       cat > $job_to_send << %%END%%
-#!/bin/ksh
-#PBS -l ${qsubmem}=${Memory}gb,${qsubtime}=$cputime
-#PBS -o $remote_dayfile
-#PBS -j o
-
-%%END%%
-
-    fi
-
  elif [[ $remote_host = lctit ]]
  then
@@ -1352 +1292 @@
           fi
           echo "echo \"exit\" >> scpjob.$identifier"                     >>  $job_to_send
-
-       elif [[ $remote_host = nech ]]
-       then
-          echo "cd /pf/b/${remote_user}/job_queue" >>  $job_to_send
-          echo "cat > scpjob.$identifier << %%END%%"  >>  $job_to_send
-          echo "#PBS -l ${qsubmem}=1GB,${qsubtime}=100"  >>  $job_to_send
-          echo "#PBS -o last_job_transfer_protocol"      >>  $job_to_send
-          echo "#PBS -j o"                         >>  $job_to_send
-          echo " "                                 >>  $job_to_send
-          echo "set -x"                            >>  $job_to_send
-          echo "cd /pf/b/${remote_user}/job_queue" >>  $job_to_send
-          echo "batch_scp  $PORTOPT  -d  -w 10  -u $local_user $local_address  $remote_dayfile  \"$job_catalog\"  $local_dayfile"  >>  $job_to_send
-          echo "[[ \"\$for_subjob_to_do\" != \"\" ]]  &&  eval \$for_subjob_to_do"  >>  $job_to_send
-          echo "%%END%%"                           >>  $job_to_send
 
        elif [[ $remote_host = lcbullhh ]]
@@ -1533 +1459 @@
           echo "rm  scpjob.$identifier"            >>  $job_to_send
        fi
-       if [[ $remote_host = nech ]]
-       then
-          echo "cd -"                           >>  $job_to_send
-       fi
     else
 #       echo "ftpcopy  -d  $local_address  ${job_catalog}/$remote_dayfile  \"$job_catalog\"  $local_dayfile"  >>  $job_to_send
@@ -1575 +1497 @@
           job_catalog_save=$job_catalog
           job_catalog=job_queue
-       elif [[ $remote_host = nech ]]
-       then
-          job_catalog_save=$job_catalog
-          job_catalog=/hpf/b/${remote_user}/job_queue
        fi
-       if [[ $remote_host = nech ]]
-       then
-             # FILES CAN ONLY BE TRANSFERED VIA DKRZ'S ARCHIVE-SERVER
-          scp  $PORTOPT  $job_to_send  ${remote_user}@136.172.44.205:${job_catalog}/$job_on_remhost
-       else
-          scp  $ssh_key  $PORTOPT  $job_to_send  ${remote_user}@${remote_address}:${job_catalog}/$job_on_remhost
-       fi
+       scp  $ssh_key  $PORTOPT  $job_to_send  ${remote_user}@${remote_address}:${job_catalog}/$job_on_remhost
        if [[ $? = 1 ]]
        then
@@ -1625 +1537 @@
           chmod  u+x  $job_on_remhost
           eval  $submcom  $job_on_remhost
-       elif [[ $local_host = nech ]]
-       then
-          if [[ $queue = default ]]
-          then
-             eval  $submcom  $job_on_remhost
-          else
-             eval  $submcom  -q $queue  $job_on_remhost
-          fi
        elif [[ $local_host = lcbullhh ]]
        then