Changeset 2257 for palm/trunk/SCRIPTS/mrun

Timestamp:

Jun 7, 2017 2:07:05 PM (7 years ago)

Author:

witha

Message:

Bugfix in PALM-WTM, modifications for lceddy

File:

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

palm/trunk/SCRIPTS/mrun

@@ -27 +27 @@
 # -----------------
 # $Id$
+# adjustments for lceddy, removed lcflow-specific code
+# 
+# 2186 2017-03-21 05:36:31Z raasch
 #
 # 2185 2017-03-21 05:09:29Z raasch
@@ -652 +655 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmkisti|ibmku|ibms|nech|lcbullhh|lccrayb|lccrayh|lccrayf|lcflow|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|nech|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -810 +813 @@
                    do_remote=true
                    case  $host  in
-                       (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lcflow|lckyoto|lcocean|nech|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+                       (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|nech|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"
@@ -1074 +1077 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lcflow|lckyoto|lcocean|nech|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|nech|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -1103 +1106 @@
        # CHECK, IF THE NUMBER OF CORES PER NODE HAS BEEN GIVEN UND IF IT IS AN
        # INTEGRAL DIVISOR OF THE TOTAL NUMBER OF CORES GIVEN BY OPTION -X
-    if [[ "$tasks_per_node" = ""  &&  $host != lcflow  &&  $host != lcxt5m ]]
+    if [[ "$tasks_per_node" = ""  &&  $host != lcxt5m ]]
     then
        printf "\n"
@@ -1119 +1122 @@
     fi
 
-    if [[ $host != lcflow  &&  $host != lcxt5m ]]
+    if [[ $host != lcxt5m ]]
     then
        (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
@@ -2421 +2424 @@
              [[ ! -f a.out ]]  &&  compile_error=true
             continue   # STATUS=1, IF a.out EXISTS
-          elif [[ $localhost = lcflow ]]
-          then 
-             printf "      compiler is called via ssh on \"flow\" \n"
-             /usr/bin/ssh  $SSH_PORTOPT  flow02.hpc.uni-oldenburg.de -l $usern "$init_cmds $module_calls cd $TEMPDIR; make $mopts -f Makefile PROG=a.out F90=$compiler_name COPT=\"$cpp_options\" F90FLAGS=\"$fopts\" LDFLAGS=\"$lopts\" "
-             check_for_file=`/usr/bin/ssh $SSH_PORTOPT flow02.hpc.uni-oldenburg.de -l $usern "ls $TEMPDIR/a.out 2> /dev/null"`
-             [[ "$check_for_file" = "" ]]  &&  compile_error=true
-             continue   # STATUS=1, IF a.out EXISTS
           elif [[ $localhost = lcbullhh  ||  $localhost = lccrayb  ||  $localhost = lccrayf ||  $localhost = lccrayh ]]
           then
+             make $mopts -f Makefile PROG=a.out  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$fopts"  LDFLAGS="$lopts"
+          elif [[ $localhost = lceddy ]]
+          then
+             which mpifc
              make $mopts -f Makefile PROG=a.out  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$fopts"  LDFLAGS="$lopts"
           else
@@ -3100 +3100 @@
                    # COPY HOSTFILE FROM SOURCE DIRECTORY OR CREATE IT, IF IT
                    # DOES NOT EXIST
-                if [[  $host != lcbullhh  && $host != lccrayb  &&  $host != lccrayf  && $host != lccrayh  &&  $host != lckyuh  &&  $host != lckyut  &&  $host != lcocean ]]
+                if [[  $host != lcbullhh  && $host != lccrayb  &&  $host != lccrayf  && $host != lccrayh  &&  $host != lckyuh  &&  $host != lckyut  &&  $host != lcocean &&  $host != lceddy ]]
                 then
                    if [[ -f $hostfile ]]
@@ -3167 +3167 @@
                    elif [[ $host = lcxe6  ||  $host = lcxt5m ]]
                    then
-                       aprun  -n $ii  -N $tasks_per_node  a.out  <  runfile_atmos
-                   elif [[ $host = lcflow ]]
-                   then
-                      mpirun -np $ii a.out  < runfile_atmos
+                    aprun  -n $ii  -N $tasks_per_node  a.out  <  runfile_atmos
+                   elif [[ $host = lceddy ]]
+                   then
+                      echo $ii
+                      echo $tasks_per_node
+                      echo $nodes
+                      mpirun -n $ii a.out  <  runfile_atmos
                    elif [[ $host = lcocean ]]
                    then
@@ -3177 +3180 @@
                    then
                       mpirun_rsh -hostfile $PBS_NODEFILE -np `cat $PBS_NODEFILE | wc -l` a.out  < runfile_atmos
+
                    elif [[ $host = lckiaps ]]
                    then
@@ -4081 +4085 @@
           then
 
-             if [[ $localhost = lcbullhh  ||  $localhost = lccrayb  ||  $localhost = lccrayh  ||  $localhost = nech  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms  ||  $localhost = lcflow  ||  $localhost = lckyu*  ||  $localhost = lcxe6 ]]
+             if [[ $localhost = lcbullhh  ||  $localhost = lccrayb  ||  $localhost = lccrayh  ||  $localhost = nech  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms  ||  $localhost = lceddy  ||  $localhost = lckyu*  ||  $localhost = lcxe6 ]]
              then
                 echo "*** ssh will be used to initiate restart-runs!"
@@ -4110 +4114 @@
                    then
                       ssh $SSH_PORTOPT $usern@gaiad "ssh $SSH_PORTOPT $return_address -l $return_username \"PATH=\\\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc\" "
-                   elif [[ $localhost = lcflow ]]
+                   elif [[ $localhost = lceddy ]]
                    then
                       /usr/bin/ssh $SSH_PORTOPT $return_address -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "
@@ -4496 +4500 @@
     echo  "export LOCAL_MRUN_PATH"                      >>  $jobfile
 
-       # lcflow ALSO REQUIRES TO PROVIDE PATH FOR THE PALM-SCRIPTS
-#    if [[ $host = lcflow  ||  $localhost = lcflow ]]
-#    then
+       # lceddy ALSO REQUIRES TO PROVIDE PATH FOR THE PALM-SCRIPTS
+    if [[ $host = lceddy  ||  $localhost = lceddy ]]
+    then
        echo  "export PALM_BIN=$PALM_BIN" | sed -e 's:'$HOME':$HOME:'   >>  $jobfile
        echo  "export PATH=\$PATH:\$PALM_BIN"              >>  $jobfile
-#    fi
+    fi
 
        # CALL MRUN WITHIN THE JOB (SETTING QUEUE IS A WORKAROUND FOR ibmkisti)