Changeset 1099 for palm/trunk/SCRIPTS/mrun

Timestamp:

Feb 10, 2013 1:47:43 AM (11 years ago)

Author:

raasch

Message:

adjustments for Forwind cluster (lcflow) and Kuyshu University computing center (hayaka -lckyuh); further small adjustments for lckyut

File:

• palm/trunk/SCRIPTS/mrun (modified) (16 diffs)

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# adjustments for Kyushu-University computing center (lckyuh - hayaka)
+# and for Forwind cluster (lcflow)
+# small further adjustments for lckyut
 #
 # Former revisions:
@@ -34 +36 @@
 #
 # 2013-02-02 07:06:13Z raasch
-# adjustments for Kyushu-University computing center (lckyut)
+# adjustments for Kyushu-University computing center (lckyut - tatara)
 #
 # 1083 2013-01-04 10:22:09Z maronga
@@ -514 +516 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|nech|necriam|lckyoto|lcsgib|lcsgih|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyut|lcsb)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|nech|necriam|lcflow|lckyoto|lcsgib|lcsgih|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -600 +602 @@
  fi
 
+
+    # WERTE VON MRUN-OPTIONEN SICHERN UND DAMIT GEGEBENENFALLS SPAETER DIE
+    # IN DER KONFIGURAIONSDATEI ANGEGEBENEN WERTE UEBERSTEUERN
+ mrun_memory=$memory
+ mrun_group_number=$group_number
+ mrun_cpumax=$cpumax
+ mrun_numprocs=$numprocs
 
 
@@ -678 +687 @@
                    do_remote=true
                    case  $host  in
-                       (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyut|lcsb)  true;;
+                       (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lcflow|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
                        (*)  printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
                             printf "\n      is not available"
@@ -817 +826 @@
 %%END%%
 
-       # WERTE VON MRUN-OPTIONEN SICHERN UND DAMIT GEGEBENENFALLS SPAETER DIE
-       # IN DER KONFIGURAIONSDATEI ANGEGEBENEN WERTE UEBERSTEUERN
-    mrun_memory=$memory
-    mrun_group_number=$group_number
-    mrun_cpumax=$cpumax
-    mrun_numprocs=$numprocs
-
     if [[ $localhost_realname = "sx-fep" ]]
     then
@@ -866 +868 @@
     rm  $interpreted_config_file
 
-
-       # OPTIONSWERTE UEBERSTEUERN KONFIGURATIONSDATEI
-    [[ $mrun_memory     != 0   ]]  &&  memory=$mrun_memory
-    [[ "$mrun_group_number" != "none" ]]  &&  group_number=$mrun_group_number
-    [[ $mrun_cpumax     != 0   ]]  &&  cpumax=$mrun_cpumax
-    [[ "$mrun_numprocs" != ""  ]]  &&  numprocs=$mrun_numprocs
-    [[ "$max_par_io_str" != "" ]]  &&  maximum_parallel_io_streams=$max_par_io_str
-    [[ "$mrun_tasks_per_node" != "" ]]  &&  tasks_per_node=$mrun_tasks_per_node
-
- fi
+ fi
+
+
+    # OPTIONSWERTE UEBERSTEUERN KONFIGURATIONSDATEI
+ [[ $mrun_memory     != 0   ]]  &&  memory=$mrun_memory
+ [[ "$mrun_group_number" != "none" ]]  &&  group_number=$mrun_group_number
+ [[ $mrun_cpumax     != 0   ]]  &&  cpumax=$mrun_cpumax
+ [[ "$mrun_numprocs" != ""  ]]  &&  numprocs=$mrun_numprocs
+ [[ "$max_par_io_str" != "" ]]  &&  maximum_parallel_io_streams=$max_par_io_str
+ [[ "$mrun_tasks_per_node" != "" ]]  &&  tasks_per_node=$mrun_tasks_per_node
 
 
@@ -962 +964 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyut|lcsb)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lcflow|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -1122 +1124 @@
         (lckiaps)    queue=normal;;
         (lckyoto)    queue=ph;;
-        (lckyut)     queue=cx-dbg;;
+        (lckyuh)     queue=fx-single;;
+        (lckyut)     queue=cx-single;;
         (lcsgib)     queue=testq;;
         (lcsgih)     queue=testq;;
@@ -1870 +1873 @@
  lopts="$lopts $netcdf_lib $dvr_lib"
  ROPTS="$ropts"
-# if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lckyoto  ||  $host = lcsgih  ||  $host = lcsgib  ||  $host = lctit  ||  $host = lcfimm  ||  $host = lcxe6 ||  $host = lcxt5m || $host = lck || $host = lckiaps || $host = lckordi || $host = lcsb || $host )  &&  -n $numprocs ]]
+# if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lckyoto  ||  $host = lcsgih  ||  $host = lcsgib  ||  $host = lctit  ||  $host = lcfimm  ||  $host = lcflow  ||  $host = lcxe6 ||  $host = lcxt5m || $host = lck || $host = lckiaps || $host = lckordi || $host = lcsb || $host )  &&  -n $numprocs ]]
 # then
     XOPT="-X $numprocs"
@@ -3509 +3512 @@
                 # COPY HOSTFILE FROM SOURCE DIRECTORY OR CREATE IT, IF IT
                 # DOES NOT EXIST
-             if [[ $host != lcsgih  &&  $host != lcsgib ]]
+             if [[ $host != lcsgih  &&  $host != lcsgib  &&  $host != lckyu* ]]
              then
                 if [[ -f $hostfile ]]
@@ -3630 +3633 @@
                 elif [[ $host = lckyu* ]]
                 then
-                   mpiexec -n $ii   a.out  <  runfile_atmos  $ROPTS
+                   mpiexec -n $ii  ./a.out  < runfile_atmos  $ROPTS
                 else
                    mpiexec  -machinefile hostfile  -n $ii  a.out  < runfile_atmos  $ROPTS
@@ -4527 +4530 @@
           then
 
-             if [[ $localhost = lcsgih  ||  $localhost = lcsgib  ||  $localhost = nech  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms ]]
+             if [[ $localhost = lcsgih  ||  $localhost = lcsgib  ||  $localhost = nech  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms  ||  $localhost = lcflow  ||  $localhost = lckyu* ]]
              then
                 echo "*** ssh will be used to initiate restart-runs!"
@@ -4771 +4774 @@
           # ABSPEICHERN DER KONFIGURATIONSDATEI
           # ABDECKZEICHEN VERHINDERN, DASS ERSETZUNGEN ERFOLGEN
+          # Lines with #$ coming from the svn keyword substitution are
+          # removed from the config file in order to avoid problems
+          # with the SGE batch system
        echo  "cat > $config_file << \"%END%\""      >>  $jobfile
-       cat   $config_file                           >>  $jobfile
+       sed 's/#$.*//g'   $config_file               >>  $jobfile
        echo  "%END%"                                >>  $jobfile
        echo  " "                                    >>  $jobfile
@@ -4835 +4841 @@
     then
        echo  "export PALM_BIN=$PALM_BIN"                >>  $jobfile
+    elif [[ $host = lcflow  ||  $localhost = lcflow ]]
+    then
+       echo  "export PALM_BIN=$PALM_BIN" | sed -e 's:'$HOME':$HOME:'   >>  $jobfile
+       echo  "export PATH=\$PATH:\$PALM_BIN"              >>  $jobfile
     fi
 
@@ -4840 +4850 @@
     echo  "set -x"                                      >>  $jobfile
     echo  "queue=$queue"                                >>  $jobfile
+#    echo  "echo \"*** shell test\" "                    >>  $jobfile
+#    echo  "which ksh"                                   >>  $jobfile
+#    echo  "ls -al /bin"                                 >>  $jobfile
     echo  "[[ \$execute_mrun = true ]]  &&  ./$mrun_com"  >>  $jobfile