Changeset 892 for palm/trunk/SCRIPTS/subjob

Timestamp:

May 2, 2012 1:51:44 PM (13 years ago)

Author:

maronga

Message:

bugfixes in parameter file check, adapted for lcxe6 (was lcxt4), new mrun.config parameter %login_init_cmd introduced

File:

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

palm/trunk/SCRIPTS/subjob

@@ -136 +136 @@
      # 29/11/11 - Siggi - adjustments for lcsgih/lcsgib queues, pingui admitted
      # 21/12/11 - Theres- solano admitted
-     # 31/01/12 - Matthias- adjustments for ibmh
+     # 31/01/12 - Matthias - adjustments for ibmh
+     # 02/05/12 - Bjoern  - lcxt4 is now lcxe6, adjustments for lcxe6, 
+     #                      bugfixes for the parameter file check, initial 
+     #                      commands on ssh calls sourced out to .mrun.config
 
 
@@ -227 +230 @@
      (gregale)               local_addres=130.75.105.109; local_host=lcmuk;;
      (hababai)               local_addres=130.75.105.108; local_host=lcmuk;;
-     (hexagon.bccs.uib.no)   local_addres=129.177.20.113; local_host=lcxt4;;
+     (hexagon.bccs.uib.no)   local_addres=129.177.20.113; local_host=lcxe6;;
      (hd1)                   local_addres=130.75.4.104;   local_host=lcsgih;;
      (hd2)                   local_addres=130.75.4.105;   local_host=lcsgih;;
@@ -242 +245 @@
      (maestro)               local_addres=130.75.105.2;   local_host=lcmuk;;
      (meteo-login*)          local_addres=193.166.211.144;local_host=lcxt5m;;
-     (nid*)                  local_addres=129.177.20.113; local_host=lcxt4;;
+     (hexagon*)              local_addres=129.177.20.113; local_host=lcxe6;;
      (nobel*)                local_addres=150.183.5.101;  local_host=ibms;;
      (orkan)                 local_addres=130.75.105.3;   local_host=lcmuk;;
@@ -390 +393 @@
         (lckordi) remote_addres=210.219.61.8; submcom=/usr/torque/bin/qsub;;
         (lctit)   queue=S; remote_addres=10.1.6.165; submcom=/opt/pbs/tools/bin/t2sub;;
-        (lcxt4)   remote_addres=129.177.20.113; submcom=/opt/torque/2.4.9-snap.201005191035/bin/qsub;;
+        (lcxe6)   remote_addres=129.177.20.113; submcom=/opt/torque/2.5.10/bin/qsub;;
         (lcxt5m)  remote_addres=193.166.211.144; submcom=/opt/pbs/10.1.0.91350/bin/qsub;;
         (lcyon)   remote_addres=165.132.26.68; submcom=/usr/torque/bin/qsub;;
@@ -926 +929 @@
 eval \`/sw/swdist/bin/modulesinit\`
 #. /usr/share/modules/init/bash
+$init_cmds
 $module_calls
 
@@ -945 +949 @@
 eval \`/sw/swdist/bin/modulesinit\`
 #. /usr/share/modules/init/bash
+$init_cmds
 $module_calls
 
@@ -951 +956 @@
     fi
 
- elif [[ $remote_host = lcxt4 ]]
+ elif [[ $remote_host = lcxe6 ]]
  then
 
@@ -969 +974 @@
 $email_directive
 
-. /opt/modules/default/init/ksh
+$init_cmds
 $module_calls
 
@@ -988 +993 @@
 #PBS -o $remote_dayfile
 
-. /opt/modules/default/init/ksh
+$init_cmds
 $module_calls
 
@@ -1036 +1041 @@
 #PBS -o $remote_dayfile
 
-. /opt/modules/default/init/ksh
+$init_cmds
 $module_calls
 
@@ -1053 +1058 @@
 #PBS -o $remote_dayfile
 
-. /opt/modules/default/init/ksh
+$init_cmds
 $module_calls
 
@@ -1141 +1146 @@
     cat > $job_to_send << %%END%%
 #!/bin/ksh
-
+$init_cmds
 $module_calls
 
@@ -1438 +1443 @@
        then
           eval  $submcom  $job_on_remhost
-       elif [[  $local_host = lcfimm  ||  $local_host = lctit  ||  $localhost = lcxt4  ||  $localhost = lck  || $localhost = lckordi||  $localhost = lcyon ]]
+       elif [[  $local_host = lcfimm  ||  $local_host = lctit  ||  $localhost = lcxe6  ||  $localhost = lck  || $localhost = lckordi||  $localhost = lcyon ]]
        then
           chmod  u+x  $job_on_remhost