Index: palm/trunk/SCRIPTS/subjob
===================================================================
--- palm/trunk/SCRIPTS/subjob	(revision 221)
+++ palm/trunk/SCRIPTS/subjob	(revision 251)
@@ -95,4 +95,5 @@
      # 23/09/08 - Gerald- paesano admitted
      # 02/10/08 - Siggi - PBS adjustments for lcxt4
+     # 02/03/09 - Siggi - Adjustments for new NEC-SX9 at RIAM
 
 
@@ -170,5 +171,4 @@
      (fimm.bccs.uib.no)      local_addres=172.20.4.2;     local_host=lcfimm;;
      (gallego)               local_addres=130.75.105.10;  local_host=lcmuk;;
-     (gate|n-sx)             local_addres=133.5.178.11;   local_host=neck;;
      (gfdl5)                 local_addres=165.132.26.58;  local_host=ibmy;;
      (gfdl3.yonsei.ac.kr)    local_addres=165.132.26.56;  local_host=decalpha;;
@@ -191,4 +191,5 @@
      (scirocco)              local_addres=172.20.25.41;   local_host=lcmuk;;
      (sun1|sun2)             local_addres=130.75.6.1;     local_host=unics;;
+     (sx-fep)                local_addres=172.16.1.131;   local_host=necriam;;
      (r1*)                   local_addres=130.75.4.102;   local_host=lcsgih;;
      (r2*)                   local_addres=130.73.232.102; local_host=lcsgib;;
@@ -249,5 +250,5 @@
     printf "\n        -h    execution host, available hosts:    $remote_host"
     printf "\n              ibm, ibmb, ibmh, ibms, ibmy, lcmuk,"
-    printf "\n              lctit, nech, neck, unics"
+    printf "\n              lctit, nech, necriam, unics"
     printf "\n        -m    memory demand per process in MByte  ---"
     printf "\n        -n    jobname                             <jobdatei>"
@@ -312,20 +313,20 @@
  else
     case  $remote_host  in
-        (ibm)    queue=p690_standard; remote_addres=134.76.99.81; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
-        (ibmb)   queue=cpar; remote_addres=130.73.230.10; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
-        (ibmh)   queue=cpar; remote_addres=130.75.4.10; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
-        (ibms)   queue=p_normal; remote_addres=150.183.5.101; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
-        (ibmy)   queue=parallel; remote_addres=165.132.26.58; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
-	(lcfimm) remote_addres=172.20.4.2; submcom=/opt/torque/bin/qsub;;
-        (lcsgib) queue=smallq; remote_addres=130.73.232.102; submcom=/opt/moab/bin/msub;;
-        (lcsgih) queue=smallq; remote_addres=130.75.4.103; submcom=/opt/moab/bin/msub;;
-        (lctit)  queue=lctit; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;
-        (lcxt4)	 remote_addres=129.177.20.113; submcom=/opt/torque/2.3.0/bin/qsub;;
-        (nech)   qsubmem=memsz_job; qsubtime=cputim_job; remote_addres=136.172.44.147; submcom="/usr/local/bin/qsub";;
-        (neck)   qsubmem=memsz_job; qsubtime=cputim_job; remote_addres=133.5.178.11; submcom="/usr/bin/nqsII/qsub";;
-        (vpp)    qsubmem=m; qsubtime=t; queue=vpp; remote_addres=130.75.4.130;;
-        (unics)  qsubmem=d; qsubtime=t; queue=unics; remote_addres=130.75.6.1;;
-        (*)      printf "\n  +++ hostname \"$remote_host\" not allowed";
-                 locat=parameter; exit;;
+        (ibm)     queue=p690_standard; remote_addres=134.76.99.81; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+        (ibmb)    queue=cpar; remote_addres=130.73.230.10; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+        (ibmh)    queue=cpar; remote_addres=130.75.4.10; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+        (ibms)    queue=p_normal; remote_addres=150.183.5.101; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+        (ibmy)    queue=parallel; remote_addres=165.132.26.58; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+	(lcfimm)  remote_addres=172.20.4.2; submcom=/opt/torque/bin/qsub;;
+        (lcsgib)  queue=smallq; remote_addres=130.73.232.102; submcom=/opt/moab/bin/msub;;
+        (lcsgih)  queue=smallq; remote_addres=130.75.4.103; submcom=/opt/moab/bin/msub;;
+        (lctit)   queue=lctit; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;
+        (lcxt4)	  remote_addres=129.177.20.113; submcom=/opt/torque/2.3.0/bin/qsub;;
+        (nech)    qsubmem=memsz_job; qsubtime=cputim_job; remote_addres=136.172.44.147; submcom="/usr/local/bin/qsub";;
+        (necriam) qsubmem=memsz_job; qsubtime=cputim_job; remote_addres=172.16.1.131; submcom="/usr/bin/nqsII/qsub";;
+        (vpp)     qsubmem=m; qsubtime=t; queue=vpp; remote_addres=130.75.4.130;;
+        (unics)   qsubmem=d; qsubtime=t; queue=unics; remote_addres=130.75.6.1;;
+        (*)       printf "\n  +++ hostname \"$remote_host\" not allowed";
+                  locat=parameter; exit;;
     esac
  fi
@@ -370,4 +371,8 @@
                      (*)    error=true;;
                  esac;;
+        (necriam) case  $ndq  in
+                     (SS|P6|X)  error=false;;
+                     (*)    error=true;;
+                 esac;;
         (t3eh)   case  $ndq  in
                      (para_t3e|em|k|l|lm|comp_t3e|c|p|ht)  error=false;;
@@ -454,5 +459,5 @@
  done
 
- if [[ $remote_host = nech  ||  $remote_host = neck ]]
+ if [[ $remote_host = nech  ||  $remote_host = necriam ]]
  then
     if (( tasks_per_node != 0 ))
@@ -803,5 +808,5 @@
     fi
 
- elif [[ $remote_host = neck ]]
+ elif [[ $remote_host = necriam ]]
  then
 
@@ -810,11 +815,9 @@
        cat > $job_to_send << %%END%%
 #!/bin/ksh
-#PBS -l cpunum_prc=$tasks_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
+#PBS -v MPIPROGINV=YES
 
 %%END%%
@@ -825,10 +828,8 @@
 #!/bin/ksh
 #PBS -q ${queue}
-#PBS -l cpunum_prc=$tasks_per_node,cputim_job=$cputime
-#PBS -l ${qsubmem}=${Memory}gb
 #PBS -o $remote_dayfile
 #PBS -N palm
 #PBS -j o
-#PBS -T mpisx
+#PBS -v MPIPROGINV=YES
 
 %%END%%
@@ -837,5 +838,4 @@
        cat > $job_to_send << %%END%%
 #!/bin/ksh
-#PBS -l ${qsubmem}=${Memory}gb,${qsubtime}=$cputime
 #PBS -o $remote_dayfile
 #PBS -j o
@@ -897,7 +897,7 @@
        then
           return_queue=sla3
-       elif [[ $remote_host = neck ]]
-       then
-          return_queue=S
+       elif [[ $remote_host = necriam ]]
+       then
+          return_queue=SS
        else
           return_queue=unknown
@@ -939,9 +939,8 @@
           echo "%%END%%"                           >>  $job_to_send
 
-       elif [[ $remote_host = neck ]]
+       elif [[ $remote_host = necriam ]]
        then
           echo "cat > scpjob.$kennung << %%END%%"  >>  $job_to_send
           echo "#PBS -q $return_queue"             >>  $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
