Changeset 2295 for palm/trunk/SCRIPTS/mrun

Timestamp:

Jun 27, 2017 2:25:52 PM (7 years ago)

Author:

raasch

Message:

script adjustments for using lcgeohu, cpp_opts removed

File:

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

palm/trunk/SCRIPTS/mrun

@@ -27 +27 @@
 # -----------------
 # $Id$
+# adjustments for using lcgeohu (cirrus @ HUB)
+# cpp_opts removed
+# 
+# 2290 2017-06-19 11:03:06Z raasch
 # further test output removed
 # 
@@ -278 +282 @@
  coupled_dist=""
  coupled_mode="mpi1"
- cpp_opts=""
  cpp_options=""
  cpumax=0
@@ -465 +468 @@
     # READ SHELLSCRIPT-OPTIONS AND REBUILD THE MRUN-COMMAND STRING (MC),
     # WHICH WILL BE USED TO START RESTART-JOBS
- while  getopts  :a:bBc:Cd:D:Fg:G:h:H:i:kK:m:M:n:o:O:p:P:q:r:R:s:St:T:u:U:vw:xX:yY:zZ option
+ while  getopts  :a:bBc:Cd:Fg:G:h:H:i:kK:m:M:n:o:O:p:P:q:r:R:s:St:T:u:U:vw:xX:yY:zZ option
  do
    case  $option  in
@@ -522 +525 @@
  then
    (printf "\n  *** mrun can be called as follows:\n"
-    printf "\n      $mrun_script_name  -b -c.. -d.. -D.. -f.. -F -h.. -i.. -I -K.. -m.. -o.. -p.. -r.. -R -s.. -t.. -T.. -v -x -X.. -y -Y.. -Z <modus> \n"
+    printf "\n      $mrun_script_name  -b -c.. -d.. -f.. -F -h.. -i.. -I -K.. -m.. -o.. -p.. -r.. -R -s.. -t.. -T.. -v -x -X.. -y -Y.. -Z <modus> \n"
     printf "\n      Description of available options:\n"
     printf "\n      Option  Description                              Default-Value"
@@ -530 +533 @@
     printf "\n        -c    configuration file                       .mrun.config"
     printf "\n        -d    base name of files attached to program   test"
-    printf "\n        -D    preprocessor(cpp)-directives             \"\" "
     printf "\n        -F    create remote job file only              ---"
     printf "\n        -h    execution host                           $localhost_realname"
@@ -657 +659 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb|lcgeohu)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -800 +802 @@
                    do_remote=true
                    case  $host  in
-                       (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+                       (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb|lcgeohu)  true;;
                        (*)  printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
                             printf "\n      is not available"
@@ -1064 +1066 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb|lcgeohu)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -1202 +1204 @@
         (lccrayb)    queue=mpp1q;;
         (lccrayh)    queue=mpp1q;;
+        (lcgeohu)    queue=short;;
         (lckiaps)    queue=normal;;
         (lckyoto)    queue=ph;;
@@ -1816 +1819 @@
     fi
 
-       # SET DIRECTIVES GIVEN BY OPTION -D
-    if [[ -n $cpp_opts ]]
-    then
-       for  popts  in  $cpp_opts
-       do
-          if [[ $(echo $localhost | cut -c1-3) = ibm ]]
-          then
-             cpp_options="${cpp_options},-D__$popts=__$popts"
-          else
-             cpp_options="$cpp_options -D__$popts"
-          fi
-       done
-    fi
-
  else
 
@@ -2390 +2379 @@
           then
              make $mopts -f Makefile PROG=a.out  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$fopts"  LDFLAGS="$lopts"
-          elif [[ $localhost = lceddy ]]
-          then
-             which mpifc
+          elif [[ $localhost = lceddy ]]
+          then
+             which mpifc
              make $mopts -f Makefile PROG=a.out  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$fopts"  LDFLAGS="$lopts"
+          elif [[ $localhost = lcgeohu ]]
+          then 
+             printf "      compiler is called via ssh on \"cirrus\" \n"
+             ssh  $SSH_PORTOPT  cirrus.geo.hu-berlin.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\" "
+#             this check did not work. Although a.out exists, it sets compile_error to true!
+#             [[ ! -f a.out ]]  &&  compile_error=true
+             continue   # STATUS=1, IF a.out EXISTS
           else
              [[ "$init_cmds" != "" ]]  &&  eval $init_cmds
@@ -2948 +2944 @@
                    then
                       echo $ii
-                      echo $tasks_per_node
-                      echo $nodes
+                      echo $tasks_per_node
+                      echo $nodes
                       mpirun -n $ii a.out  <  runfile_atmos
+                   elif [[ $host = lcgeohu ]]
+                   then
+                       srun -n $ii a.out  <  runfile_atmos
                    elif [[ $host = lcocean ]]
                    then
@@ -3533 +3532 @@
        then
 
-          if [[ $localhost = lcbullhh  ||  $localhost = lccrayb  ||  $localhost = lccrayh  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms  ||  $localhost = lceddy  ||  $localhost = lckyu*  ||  $localhost = lcxe6 ]]
+          if [[ $localhost = lcbullhh  ||  $localhost = lccrayb  ||  $localhost = lccrayh  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms  ||  $localhost = lceddy  ||  $localhost = lckyu*  ||  $localhost = lcxe6  ||  $localhost = lcgeohu ]]
           then
              echo "*** ssh will be used to initiate restart-runs!"
@@ -3574 +3573 @@
                 then
                    ssh $usern@hlogin1 "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 = lccgeohu ]]
+                then
+                   ssh $usern@cirrus.geo.hu-berlin.de "ssh $SSH_PORTOPT $return_address -l $return_username \"PATH=\\\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc\" "
                 else
                    ssh $SSH_PORTOPT $return_address -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "
@@ -3666 +3668 @@
        # BUILD THE MRUN-COMMAND TO BE CALLED IN THE BATCH-JOB ON THE REMOTE-MACHINE
     mrun_com="$mrun_script_name -a $afname -c $config_file -d $fname -h $host -H $fromhost -m $memory -t $cpumax -q $queue -R $return_address -U $return_username -u $remote_username"
-    [[ "$cpp_opts" != "" ]]       &&  mrun_com=${mrun_com}" -D \"$cpp_opts\""
     [[ "$global_revision" != "" ]]  &&  mrun_com=${mrun_com}" -G \"$global_revision\""
     [[ $group_number != none ]]   &&  mrun_com=${mrun_com}" -g $group_number"
@@ -3772 +3773 @@
        #              THIS MAY CREATE A QUITE LARGE JOB-FILE, WHICH CAN CAUSE PROBLEMS WITH SOME
        #              QUEUEING-SYSTEMS
-    if [[ $host = ibmkisti  ||  $host = lcbullhh  ||  $host = lccrayb  ||  $host = lccrayf  ||  $host = lccrayh  ||  $host = lcocean ]]
+    if [[ $host = ibmkisti  ||  $host = lcbullhh  ||  $host = lccrayb  ||  $host = lccrayf  ||  $host = lccrayh  ||  $host = lcocean  ||  $host = lcgeohu ]]
     then