Changeset 693 for palm/trunk

Timestamp:

Mar 8, 2011 8:27:49 AM (14 years ago)

Author:

raasch

Message:

New:
---
adjustments for ibmkisti (pres, batch_scp, mbuild, mrun, subjob)

new default configuration files .mrun.config.yonsei2011 and .config_block_for_ibmkisti

Changed:

---

Errors:

---

bugfix: weighting coefficient added to ibm branch (pres)

Location:

palm/trunk

Files:

• SCRIPTS/.config_block_for_ibmkisti (added)
• SCRIPTS/.mrun.config.yonsei2011 (added)
• SCRIPTS/batch_scp (modified) (11 diffs)
• SCRIPTS/mbuild (modified) (3 diffs)
• SCRIPTS/mrun (modified) (23 diffs)
• SCRIPTS/subjob (modified) (17 diffs)
• SOURCE/pres.f90 (modified) (2 diffs)

palm/trunk/SCRIPTS/batch_scp

@@ -45 +45 @@
      # 25/10/05 - Siggi - put of catalogs realized
      # 27/04/09 - Marcus- use option -p for all scp calls
+     # 08/03/11 - Siggi - adjustments for ibmkisti: this machine allows
+     #                    outgoing ssh/scp connections only from the
+     #                    interactive nodes (gaiad). All ssh/scp traffic is
+     #                    done via this interactive node.
 
 
@@ -60 +64 @@
  get=false
  local_host=`hostname`
+ local_user=$USER
+ local_wdir=`pwd`
  locat=normal
  make_catalog=false
@@ -286 +292 @@
 
     # VERZEICHNISLSTE DES ZIELRECHNERS ERSTELLEN
- ssh $1 -l $remote_user "cd $3; ls -1; echo '*** list complete'" > $filelist  2>&1
+ if [[ $(echo $local_host | cut -c1-4) = gaia ]]
+ then
+    ssh $local_user@gaiad "ssh $1 -l $remote_user \"cd $3; ls -1; echo '*** list complete'\" "  > $filelist  2>&1
+ else
+    ssh $1 -l $remote_user "cd $3; ls -1; echo '*** list complete'" > $filelist  2>&1
+ fi
  ssh_status=$?
 
@@ -491 +502 @@
  then
     rm -rf $filelist
-    ssh $1 -l $remote_user "cd $3" > $filelist
+    if [[ $(echo $local_host | cut -c1-4) = gaia ]]
+    then
+       ssh $local_user@gaiad "ssh $1 -l $remote_user \"cd $3\" " > $filelist
+    else
+       ssh $1 -l $remote_user "cd $3" > $filelist
+    fi
     if [[ $? != 0 ]]
     then
@@ -542 +558 @@
                 scp -p -r -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
              fi
+          elif [[ $(echo $local_host | cut -c1-4) = gaia ]]
+          then
+             if [[ $catalog_copy = false ]]
+             then
+                ssh $local_user@gaiad "cd $local_wdir; scp -p $2 $remote_user@$1:$catalog_name$4$zyklusnr"  > /dev/null
+             else
+                ssh $local_user@gaiad "cd $local_wdir; scp -p -r $2 $remote_user@$1:$catalog_name$4$zyklusnr"  > /dev/null
+             fi
           else
              if [[ $catalog_copy = false ]]
@@ -559 +583 @@
              local_size=`echo $local_size | cut -d" " -f5`
 
-             remote_size=`ssh $1 -l $remote_user "ls -al $catalog_name$4$zyklusnr"`
+             if  [[ $(echo $local_host | cut -c1-4) = gaia ]]
+             then
+                remote_size=`ssh $local_user@gaiad "ssh $1 -l $remote_user \"ls -al $catalog_name$4$zyklusnr\" "`
+             else
+                remote_size=`ssh $1 -l $remote_user "ls -al $catalog_name$4$zyklusnr"`
+             fi
              remote_size=`echo $remote_size | cut -d" " -f5`
 
@@ -571 +600 @@
           fi
        else
-          scp -p $2 $remote_user@$1:${catalog_name}batch_scp_append_file.$random  > /dev/null
+          if [[ $(echo $local_host | cut -c1-4) = gaia ]]
+          then
+             ssh $local_user@gaiad "cd $local_wdir; scp -p $2 $remote_user@$1:${catalog_name}batch_scp_append_file.$random"  > /dev/null
+          else
+             scp -p $2 $remote_user@$1:${catalog_name}batch_scp_append_file.$random  > /dev/null
+          fi
           if [[ $? != 0 ]]
           then
@@ -579 +613 @@
              local_size=`echo $local_size | cut -d" " -f5`
 
-             remote_size=`ssh $1 -l $remote_user "ls -al ${catalog_name}batch_scp_append_file.$random"`
+             if  [[ $(echo $local_host | cut -c1-4) = gaia ]]
+             then
+                remote_size=`ssh $local_user@gaiad "ssh $1 -l $remote_user \"ls -al ${catalog_name}batch_scp_append_file.$random\" "`
+             else
+                remote_size=`ssh $1 -l $remote_user "ls -al ${catalog_name}batch_scp_append_file.$random"`
+             fi
              remote_size=`echo $remote_size | cut -d" " -f5`
 
@@ -593 +632 @@
           rm  $filelist
 
-          ssh $1 -l $remote_user "cd $3; cat batch_scp_append_file.$random >> $4$zyklusnr; rm batch_scp_append_file.$random; echo '*** append complete'" > $filelist
+          if  [[ $(echo $local_host | cut -c1-4) = gaia ]]
+          then
+             ssh $local_user@gaiad "ssh $1 -l $remote_user \"cd $3; cat batch_scp_append_file.$random >> $4$zyklusnr; rm batch_scp_append_file.$random; echo '*** append complete'\" " > $filelist
+          else
+             ssh $1 -l $remote_user "cd $3; cat batch_scp_append_file.$random >> $4$zyklusnr; rm batch_scp_append_file.$random; echo '*** append complete'" > $filelist
+          fi
           if [[ $? != 0 ]]
           then
@@ -608 +652 @@
        fi
     else
-       ssh $1 -l $remote_user "mkdir -p $3"
+       if  [[ $(echo $local_host | cut -c1-4) = gaia ]]
+       then
+          ssh $local_user@gaiad "ssh $1 -l $remote_user \"mkdir -p $3\" "
+       else
+          ssh $1 -l $remote_user "mkdir -p $3"
+       fi
        if [[ $? != 0 ]]
        then
           locat=ssh_failed_4; exit
        fi
-       scp -p $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
+       if  [[ $(echo $local_host | cut -c1-4) = gaia ]]
+       then
+          ssh $local_user@gaiad "cd $local_wdir; scp -p $2 $remote_user@$1:$catalog_name$4$zyklusnr"  > /dev/null
+       else
+          scp -p $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
+       fi
        if [[ $? != 0 ]]
        then
@@ -632 +686 @@
        else
 
-          scp -p $remote_user@$1:$catalog_name$4$zyklusnr $2  > /dev/null
+          if  [[ $(echo $local_host | cut -c1-4) = gaia ]]
+          then
+             ssh $local_user@gaiad "cd $local_wdir; scp -p $remote_user@$1:$catalog_name$4$zyklusnr $2"  > /dev/null
+          else
+             scp -p $remote_user@$1:$catalog_name$4$zyklusnr $2  > /dev/null
+          fi
           if [[ $? != 0 ]]
           then

palm/trunk/SCRIPTS/mbuild

@@ -117 +117 @@
      # 14/12/10 - Siggi - adjustments for new Tsubame system at Tokyo
      #                    institute of technology (lctit)
-     # 04/03/11 - BjörnM- re-adjustments for lcxt4
+     # 04/03/11 - BjornM- re-adjustments for lcxt4
+     # 06/03/11 - Siggi - adjustments for ibmkisti
 
 
@@ -479 +480 @@
         (decalpha)       remote_addres=165.132.26.56;;
         (ibmh)           remote_addres=136.172.40.15;;
+        (ibmkisti)       remote_addres=150.183.146.24;;
         (ibmku)          remote_addres=133.5.4.129;;
         (ibms)           remote_addres=150.183.5.101;;
@@ -1063 +1065 @@
           fi
 
-          if [[ $remote_host = ibms  ||  $remote_host = ibmy ]]
+          if [[ $remote_host = ibmkisti  ||  $remote_host = ibms  ||  $remote_host = ibmy ]]
           then
 

palm/trunk/SCRIPTS/mrun

@@ -219 +219 @@
      # 02/02/10 - Siggi  - further adjustments on Tsubame and concerning openMP
      #                     usage
-     # 09/02/10 - Siggi  - mpt bugfix for netCDF4 usage
+     # 09/02/10 - Siggi  - adjustments for ibmkisti, mpt bugfix for netCDF4
+     #                     usage, totalview usage extended
 
 
@@ -304 +305 @@
  then
    return_addres=133.5.185.60
-   echo "+++ WARNING: return_addres changed to $return_addres !!!!!"
+   echo "+++ WARNING: fixed return_addres = $return_addres is used !!!!!"
+ elif [[ `hostname` = climate0 ]]
+ then
+   return_addres=165.132.26.68
+   echo "+++ WARNING: fixed return_addres = $return_addres is used !!!!!"
  else
     return_addres=$(nslookup `hostname` 2>&1 | grep "Address:" | tail -1 | awk '{print $2}')
@@ -670 +675 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmku|ibms|ibmy|nech|necriam|lckyoto|lcsgib|lcsgih|unics|lcxt4|lcxt5m|lck)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|nech|necriam|lckyoto|lcsgib|lcsgih|unics|lcxt4|lcxt5m|lck)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -834 +839 @@
                    do_remote=true
                    case  $host  in
-                       (ibm|ibmh|ibmku|ibms|ibmy|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxt4|lcxt5m|lck)  true;;
+                       (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxt4|lcxt5m|lck)  true;;
                        (*)  printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
                             printf "\n      is not available"
@@ -1099 +1104 @@
     # GLOBALE REVISIONSNUMMER ERMITTELN (FORTSETZUNGSLAEUFEN WIRD DIESE
     # DURCH OPTION -G MITGETEILT)
- if [[ "$global_revision" = "" ]]
+ if [[ "$global_revision" = ""   &&  $host != "ibmkisti" ]]
  then
     global_revision=`svnversion $source_path  2>/dev/null`
@@ -1116 +1121 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmh|ibmku|ibms|ibmy|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxt4|lcxt5m|lck)  true;;
+        (ibm|ibmh|ibmkisti|ibmku|ibms|ibmy|lckyoto|lcsgib|lcsgih|nech|necriam|unics|lcxt4|lcxt5m|lck)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -1145 +1150 @@
        # DEFAULT-WERT SETZEN) UND OB SIE EIN GANZZAHLIGER TEILER DER
        # GESAMTPROZESSORANZAHL IST
-    if [[ $host = nech  ||  $host = necriam  ||  $host = ibmh  ||  $host = ibms ]]
+    if [[ $host = nech  ||  $host = necriam  ||  $host = ibmh  ||  $host = ibmkisti  ||  $host = ibms ]]
     then
        [[ "$tasks_per_node" = "" ]]  &&  tasks_per_node=6
@@ -1258 +1263 @@
     case  $host  in
         (ibmh)       queue=no_class;;
+        (ibmkisti)   queue=class.32plus;;
         (ibmy)       queue=parallel;;
         (lckyoto)    queue=ph;;
@@ -2990 +2996 @@
     fi
 
+    if [[ "$totalview" = true ]]
+    then
+       printf "\n *** totalview debugger will be used"
+       tv_opt="-tv"
+    else
+       tv_opt=""
+    fi
+
     if [[ "$cond1" = debug  ||  "$cond2" = debug ]]
     then
@@ -3063 +3077 @@
              then
                 printf "\n     running totalview debugger"
-                mpiexec_mpt -tv -n $ii   ./a.out  $ROPTS  < runfile_atmos
+                mpiexec_mpt $tv_opt -n $ii   ./a.out  $ROPTS  < runfile_atmos
              else
                 mpiexec_mpt -np $ii   ./a.out  $ROPTS  < runfile_atmos
@@ -3075 +3089 @@
              then
                 printf "\n     running totalview debugger"
-                mpiexec -tv ./a.out  $ROPTS  < runfile_atmos
+                mpiexec $tv_opt ./a.out  $ROPTS  < runfile_atmos
              else
                 mpiexec    ./a.out  $ROPTS  < runfile_atmos
@@ -3097 +3111 @@
           then
                 # SETUP THE IBM MPI ENVIRONMENT
-             if [[ $host != ibmh ]]
+             if [[ $host != ibmh  &&  $host != ibmkisti ]]
              then
                 export MP_SHARED_MEMORY=yes
@@ -3112 +3126 @@
                 [[ $node_usage = not_shared ]]  &&  export MP_SINGLE_THREAD=yes
              fi
+
+             if [[ $host = ibmkisti ]]
+             then
+                export LANG=en_US
+                export MP_SHARED_MEMORY=yes
+                export MP_SINGLE_THREAD=yes
+                export MEMORY_AFFINITY=MCM
+             fi
+
              if [[ "$LOADLBATCH" = yes ]]
              then
@@ -3141 +3164 @@
                 then
                    poe  a.out  -procs $numprocs  -nodes 1  -rmpool 0  $ROPTS
-                elif [[ $localhost = ibmku  ||  $localhost = ibmy ]]
+                elif [[ $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibmy ]]
                 then
                    if [[ -f $hostfile ]]
@@ -3313 +3336 @@
                       export MPI_GROUP_MAX=64
                       echo "*** MPI_GROUP_MAX=$MPI_GROUP_MAX"
-                      mpiexec_mpt -np $ii   ./a.out  $ROPTS  < runfile_atmos
+                      if [[ $use_openmp = true ]]
+                      then
+                         echo " mpiexec -npernode $tasks_per_node  ./a.out  $ROPTS  <  runfile_atmos"
+                         mpiexec -npernode $tasks_per_node $tv_opt ./a.out  $ROPTS  <  runfile_atmos
+                      else
+                         mpiexec_mpt -np $ii $tv_opt  ./a.out  $ROPTS  < runfile_atmos
+                      fi
 
                           # next is test for openmp usage
@@ -3340 +3369 @@
                       then
                          echo " mpiexec -npernode $tasks_per_node  ./a.out  $ROPTS  <  runfile_atmos"
-                         mpiexec -npernode $tasks_per_node  ./a.out  $ROPTS  <  runfile_atmos
+                         mpiexec -npernode $tasks_per_node $tv_opt ./a.out  $ROPTS  <  runfile_atmos
                       else
-                         mpiexec -np $ii  ./a.out  $ROPTS  < runfile_atmos
+                         mpiexec -np $ii $tv_opt ./a.out  $ROPTS  < runfile_atmos
                       fi
                    fi
@@ -4236 +4265 @@
           then
 
-             if [[ $localhost = lcsgih  ||  $localhost = lcsgib  ||  $localhost = nech  ||  $localhost = ibmh  ||  $localhost = ibmku  ||  $localhost = ibms ]]
+             if [[ $localhost = lcsgih  ||  $localhost = lcsgib  ||  $localhost = nech  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms ]]
              then
                 echo "*** ssh will be used to initiate restart-runs!"
@@ -4245 +4274 @@
                    ssh $return_addres -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/muksoft/packages/intel/Compiler/11.0/083/lib/intel64/;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "
                 else
-                   ssh $return_addres -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "
+                   if [[ $localhost = ibmkisti ]]
+                   then
+                      ssh $usern@gaiad "ssh $return_addres -l $return_username \"PATH=\\\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc\" "
+                   else
+                      ssh $return_addres -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "
+                   fi
                 fi
              else
@@ -4333 +4367 @@
 
        # MRUN-BEFEHL FUER REMOTE-MASCHINE ZUSAMMENSTELLEN
-    mrun_com="$mrun_script_name -a $afname -c $config_file -d $fname -h $host -H $fromhost -m $memory -t $cpumax -q $queue -R $return_addres -U $return_username -u $remote_username"
+    mrun_com="$mrun_script_name -a $afname -c $config_file -d $fname -h $host -H $fromhost -m $memory -t $cpumax -q \$queue -R $return_addres -U $return_username -u $remote_username"
     [[ "$cpp_opts" != "" ]]       &&  mrun_com=${mrun_com}" -D \"$cpp_opts\""
     [[ "$global_revision" != "" ]]  &&  mrun_com=${mrun_com}" -G \"$global_revision\""
@@ -4385 +4419 @@
        # BEREITSTELLUNG VON QUELLTEXTEN, MRUN-SCRIPTS UND KONFIGURATIONS-
        # DATEI FUER DEN JOB
-    if [[ $( echo $host | cut -c1-5 ) = lcsgi ]]
+    if [[ $( echo $host | cut -c1-5 ) = lcsgi  ||  $host = ibmkisti ]]
     then
 
@@ -4397 +4431 @@
 
           # SOURCE-VERZEICHNIS VOM LOKALEN RECHNER PER SCP TRANSFERIEREN
+          # (BEI JOBS AUF LOKALEM RECHNER REICHT CP)
        echo  "set -x"  >>  $jobfile
-       echo  "scp  -r  $return_username@$return_addres:$working_directory/SOURCES_FOR_RUN_$fname ."  >>  $jobfile
+       if [[ $host = $localhost ]]
+       then
+          echo  "cp  -r  $working_directory/SOURCES_FOR_RUN_$fname ."  >>  $jobfile
+       else
+          if [[ $host != ibmkisti ]]
+          then
+             echo  "scp  -r  $return_username@$return_addres:$working_directory/SOURCES_FOR_RUN_$fname ."  >>  $jobfile
+          else
+                # on KISTI's IBM firewall is only opened on interactive node
+             echo  "localdir=\`pwd\`"                            >>  $jobfile
+             echo  "ssh $remote_username@gaiad \"cd \$localdir; scp  -r  $return_username@$return_addres:$working_directory/SOURCES_FOR_RUN_$fname .\" "  >>  $jobfile
+          fi
+       fi
        echo  "export SOURCES_COMPLETE=true"                      >>  $jobfile
 
@@ -4456 +4503 @@
           # ABSPEICHERN DER AKTUELLEN MRUN-VERSION
           # ABDECKZEICHEN VERHINDERN, DASS ERSETZUNGEN ERFOLGEN
-       echo  "cat > $mrun_script_name <<\"%END%\""  >>  $jobfile
-       cat   ${PALM_BIN}/$mrun_script_name          >>  $jobfile
-       echo  "%END%"                                >>  $jobfile
+       echo  "cat > $mrun_script_name <<\"%END%\""    >>  $jobfile
+       cat   ${PALM_BIN}/$mrun_script_name            >>  $jobfile
+       echo  "%END%"                                  >>  $jobfile
        echo  "chmod u+x $mrun_script_name"          >>  $jobfile
        echo  "execute_mrun=true"                    >>  $jobfile
@@ -4514 +4561 @@
     fi
 
-       # MRUN AUF ZIELRECHNER AUFRUFEN
+       # MRUN AUF ZIELRECHNER AUFRUFEN (queue is workaround for ibmkisti)
     echo  "set -x"                                      >>  $jobfile
+    echo  "queue=$queue"                                >>  $jobfile
     echo  "[[ \$execute_mrun = true ]]  &&  ./$mrun_com"  >>  $jobfile
 

palm/trunk/SCRIPTS/subjob

@@ -127 +127 @@
      #                    institute of technology (lctit)
      # 02/02/11 - Siggi - further asjustments for Tsubame concerning openMP
+     # 06/03/11 - Siggi - adjustments for ibmkisti
 
 
@@ -204 +205 @@
      (bicegate2)             local_addres=130.73.232.103; local_host=lcsgib;;
      (caurus)                local_addres=130.75.105.19;  local_host=lcmuk;;
+     (climate*)              local_addres=165.132.26.68;  local_host=lcyon;;
      (compute-*.local)       local_addres=172.20.4.2;     local_host=lcfimm;;
      (cs*)                   local_addres=136.172.44.131; local_host=nech;;
@@ -209 +211 @@
      (fimm.bccs.uib.no)      local_addres=172.20.4.2;     local_host=lcfimm;;
      (node*)                 local_addres=165.132.26.61   local_host=lck;;
+     (gaia*)                 local_addres=150.183.146.24; local_host=ibmkisti;;
      (gallego)               local_addres=130.75.105.10;  local_host=lcmuk;;
      (gfdl5)                 local_addres=165.132.26.58;  local_host=ibmy;;
@@ -297 +300 @@
     printf "\n        -D    only the job-file will be created   ---"
     printf "\n        -h    execution host, available hosts:    $remote_host"
-    printf "\n              ibm, ibmh, ibmku, ibms, ibmy, lc...,"
+    printf "\n              ibm, ibmh, ibmkisti, ibmku, ibms, ibmy, lc...,"
     printf "\n              lctit, nech, necriam, unics"
     printf "\n        -m    memory demand per process in MByte  ---"
@@ -363 +366 @@
         (ibm)     queue=p690_standard; remote_addres=134.76.99.81; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (ibmh)    queue=no_class; remote_addres=136.172.40.15; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+        (ibmkisti) queue=class.32plus; remote_addres=150.183.146.24; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (ibmku)   queue=s4; remote_addres=133.5.4.129; submcom=/usr/local/bin/llsubmit;;
         (ibms)    queue=p_normal; remote_addres=150.183.5.101; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
@@ -374 +378 @@
         (lcxt4)   remote_addres=129.177.20.113; submcom=/opt/torque/2.4.9-snap.201005191035/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;;
         (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";;
@@ -396 +401 @@
         (ibmh)   case  $ndq  in
                      (no_class)  error=false;;
+                     (*)                                     error=true;;
+                 esac;;
+        (ibmkisti)   case  $ndq  in
+                     (class.32plus|class.1-2|class.2-32)  error=false;;
                      (*)                                     error=true;;
                  esac;;
@@ -589 +598 @@
  else
     remote_dayfile=/dev/null
-    if [[ $(echo $remote_host | cut -c1-3) = ibm ]]
-    then
-       notification='# @ notification = never'
-    fi
  fi
 
@@ -610 +615 @@
     data_limit="# @ data_limit = 1.76gb"
     image_size="# @ image_size = 50"
-
+    wall_clock_limit="# @ wall_clock_limit = ${timestring},$timestring"
+
+    if [[ $email_notification = none ]]
+    then
+       notify_user=""
+    else
+       notify_user="# @ notify_user = $email_notification"
+       if [[ $delete_dayfile = true ]]
+       then
+          notification='# @ notification = never'
+       fi
+    fi
 
     if [[ $remote_host = ibmh ]]
@@ -618 +634 @@
        class=""
        environment=""
+    elif [[ $remote_host = ibmkisti ]]
+    then
+       network_to_use="# @ network.MPI = sn_all,shared,US"
+       wall_clock_limit="# @ wall_clock_limit = $timestring"
+       rset="# @ rset = RSET_MCM_AFFINITY"
+       mcm_affinity_options="# @ mcm_affinity_options = mcm_mem_pref mcm_sni_none mcm_distribute"
+       environment=""
+       use_shell=""
+       data_limit=""
+       image_size=""
     elif [[ $remote_host = ibmku ]]
     then
@@ -641 +667 @@
 
 # @ job_type = parallel
-# @ job_name = palm
-# @ wall_clock_limit = ${timestring},$timestring
+# @ job_name = $job_name
 # @ resources = ConsumableCpus($threads_per_task) $consumable_memory
 # @ output = $remote_dayfile
 # @ error = $remote_dayfile
+$wall_clock_limit
 $image_size
 $class
@@ -651 +677 @@
 $network_to_use
 $data_limit
+$rset
+$mcm_affinity_options
 $notification
+$notify_user
 
 %%END%%
@@ -658 +687 @@
     then
 
-       cat >> $job_to_send << %%END%%
+       if [[ $remote_host != ibmkisti ]]
+       then
+
+          cat >> $job_to_send << %%END%%
 # @ node = $nodes
 # @ tasks_per_node = $processes_per_node
@@ -665 +697 @@
 
 %%END%%
+
+       else
+
+          cat >> $job_to_send << %%END%%
+# @ total_tasks = $numprocs
+# @ blocking = unlimited
+# @ queue
+
+%%END%%
+
+       fi
 
     else
@@ -762 +805 @@
 
 mpd &
+
+%%END%%
+
+    else
+       cat > $job_to_send << %%END%%
+#!/bin/ksh
+#PBS -N $job_name
+#PBS -l walltime=$timestring
+#PBS -l ncpus=1
+#PBS -l pmem=${memory}mb
+#PBS -o $remote_dayfile
+#PBS -j oe
+
+%%END%%
+
+    fi
+
+ elif [[ $remote_host = lcyon ]]
+ then
+
+    if [[ $numprocs != 0 ]]
+    then
+       cat > $job_to_send << %%END%%
+#!/bin/ksh
+#PBS -N $job_name
+#PBS -l walltime=$timestring
+#PBS -l ncpus=$numprocs
+#PBS -l pmem=${memory}mb
+#PBS -o $remote_dayfile
+#PBS -j oe
 
 %%END%%
@@ -1080 +1153 @@
        then
           return_queue=c1
+       elif [[ $remote_host = ibmkisti ]]
+       then
+          return_queue=class.1-2
        elif [[ $remote_host = ibmku ]]
        then
@@ -1332 +1408 @@
        then
           eval  $submcom  $job_on_remhost
-       elif [[  $local_host = lcfimm  ||  $local_host = lctit  ||  $localhost = lcxt4 || $localhost = lck ]]
+       elif [[  $local_host = lcfimm  ||  $local_host = lctit  ||  $localhost = lcxt4  ||  $localhost = lck  ||  $localhost = lcyon ]]
        then
           chmod  u+x  $job_on_remhost

palm/trunk/SOURCE/pres.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! bugfix: weighting coefficient added to ibm branch
 !
 ! Former revisions:
@@ -291 +292 @@
     ENDDO
 
-    localsum = ( localsum + threadsum ) * dt_3d
+    localsum = ( localsum + threadsum ) * dt_3d * &
+               weight_pres(intermediate_timestep_count)
+
     !$OMP END PARALLEL
 #else