Index: /palm/trunk/SCRIPTS/.config_block_for_ibmkisti
===================================================================
--- /palm/trunk/SCRIPTS/.config_block_for_ibmkisti	(revision 693)
+++ /palm/trunk/SCRIPTS/.config_block_for_ibmkisti	(revision 693)
@@ -0,0 +1,16 @@
+# Settings in this block are valid for the IBM-Regatta-Power6 system at KISTI
+# Don't forget to replace "<replace by your KISTI username>" by your valid
+# username for the KISTI system!
+%compiler_name     mpxlf95_r                                  ibmkisti parallel
+%compiler_name_ser xlf95                                      ibmkisti parallel
+%cpp_options       -qsuffix=cpp=f90:-WF,-DMPI_REAL=MPI_DOUBLE_PRECISION,-D__netcdf=__netcdf,-D__netcdf_64bit=__netcdf_64bit  ibmkisti parallel
+%netcdf_inc        -I:/applic/local/64BIT/NETCDF/V363/include       ibmkisti parallel
+%netcdf_lib        -L/applic/local/64BIT/NETCDF/V363/lib:-lnetcdf   ibmkisti parallel
+%fopts             -O3:-g:-qfloat=nomaf:-qrealsize=8:-Q:-q64:-qmaxmem=-1:-qtune=pwr6:-qarch=pwr6:-qnosave:-qnoescape    ibmkisti parallel
+%lopts             -O3:-g:-qfloat=nomaf:-qrealsize=8:-Q:-q64:-qmaxmem=-1:-qtune=pwr6:-qarch=pwr6:-qnosave:-qnoescape:-lesslsmp   ibmkisti parallel
+%memory            2000                                       ibmkisti parallel
+%cpumax            1000                                       ibmkisti parallel
+%numprocs          4                                          ibmkisti parallel
+%remote_username   <replace by your KISTI username>           ibmkisti parallel
+%tmp_data_catalog  /gpfs1/<replace by your KISTI username>/palm_restart_data  ibmkisti parallel
+%tmp_user_catalog  /gpfs1/<replace by your KISTI username>    ibmkisti parallel
Index: /palm/trunk/SCRIPTS/.mrun.config.yonsei2011
===================================================================
--- /palm/trunk/SCRIPTS/.mrun.config.yonsei2011	(revision 693)
+++ /palm/trunk/SCRIPTS/.mrun.config.yonsei2011	(revision 693)
@@ -0,0 +1,207 @@
+# recommended settings for Department of Atmospheric Sciences
+# machines climate0-climate3 (host identifier "lcyon")
+# and for IBM-Regatta-Power6 at KISTI (host identifier "ibmkisti")
+# DON'T FORGET to replace <...> by your respective valid username
+#column 1          column 2                                   column 3
+#name of variable  value of variable (~ must not be used)     scope
+#----------------------------------------------------------------------------
+%mainprog          palm.f90
+%base_directory    $HOME/palm/current_version
+%base_data         ~/palm/current_version/JOBS
+%source_path       $base_directory/trunk/SOURCE
+%add_source_path   $base_directory/USER_CODE/$fname
+%depository_path   $base_directory/MAKE_DEPOSITORY
+#
+%host_identifier   climate0    lcyon
+%host_identifier   gaia*       ibmkisti
+#
+%remote_username   <replace by username on climate0>             lcyon parallel
+%tmp_user_catalog  $base_directory/work                          lcyon parallel
+%tmp_data_catalog  $base_directory/work                          lcyon parallel
+%compiler_name     mpif90                                        lcyon parallel
+%compiler_name_ser ifort                                         lcyon parallel
+%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   lcyon parallel
+%netcdf_inc        -I:/usr/local/netcdf/363_intel11/include      lcyon parallel
+%netcdf_lib        -L/usr/local/netcdf/363_intel11/lib:-lnetcdf        lcyon parallel
+%mopts             -j:4                                          lcyon parallel
+%fopts             -fpe0:-axW:-O3:-cpp:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-I:/usr/local/mpich2/intel11/include     lcyon parallel
+%lopts             -fpe0:-axW:-O3:-cpp:-openmp:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib:-L:/usr/local/mpich2/intel11/lib                    lcyon parallel
+%memory            2000                                          lcyon parallel
+#
+%compiler_name     mpxlf95_r                                  ibmkisti parallel
+%compiler_name_ser xlf95                                      ibmkisti parallel
+%cpp_options       -qsuffix=cpp=f90:-WF,-DMPI_REAL=MPI_DOUBLE_PRECISION,-D__netcdf=__netcdf,-D__netcdf_64bit=__netcdf_64bit  ibmkisti parallel
+%netcdf_inc        -I:/applic/local/64BIT/NETCDF/V363/include       ibmkisti parallel
+%netcdf_lib        -L/applic/local/64BIT/NETCDF/V363/lib:-lnetcdf   ibmkisti parallel
+%fopts             -O3:-g:-qfloat=nomaf:-qrealsize=8:-Q:-q64:-qmaxmem=-1:-qtune=pwr6:-qarch=pwr6:-qnosave:-qnoescape    ibmkisti parallel
+%lopts             -O3:-g:-qfloat=nomaf:-qrealsize=8:-Q:-q64:-qmaxmem=-1:-qtune=pwr6:-qarch=pwr6:-qnosave:-qnoescape:-lesslsmp   ibmkisti parallel
+%memory            2000                                       ibmkisti parallel
+%cpumax            1000                                       ibmkisti parallel
+%numprocs          4                                          ibmkisti parallel
+%remote_username   <replace by username on KISTI-IBM>         ibmkisti parallel
+%tmp_data_catalog  /gpfs1/<replace by username on KISTI-IBM>/palm_restart_data    ibmkisti parallel
+%tmp_user_catalog  /gpfs1/<replace by username on KISTI-IBM>                      ibmkisti parallel
+#
+%write_binary                true                             restart
+#
+#----------------------------------------------------------------------------
+# INPUT-commands, executed before running PALM - lines must start with "IC:" 
+#----------------------------------------------------------------------------
+#IC:[[ \$( echo \$localhost | cut -c1-3 ) = t3e ]]  &&  assign -F cachea:512:1:1 f:BININ
+#
+#----------------------------------------------------------------------------
+# ERROR-commands - executed when program terminates abnormally
+#----------------------------------------------------------------------------
+EC:[[ \$locat = compile && ( \$( echo \$localhost | cut -c1-3 ) = t3e ) ]]  &&  cat  cflist.out
+EC:[[ \$locat = execution ]]  &&  cat  RUN_CONTROL
+EC:[[ \$locat = execution ]]  &&  cat  PARTICLE_INFOS/*
+EC:[[ \$( echo \$localhost | cut -c1-3 ) = t3e ]]  &&  ls -al
+EC:[[ \$( echo \$localhost | cut -c1-3 ) = ibm ]]  &&  ls -al
+#
+#----------------------------------------------------------------------------
+# OUTPUT-commands - executed when program terminates normally
+#----------------------------------------------------------------------------
+#
+# Combine 1D- and 3D-profile output (these files are not usable for plotting)
+OC:[[ -f LIST_PROFIL_1D     ]]  &&  cat  LIST_PROFIL_1D  >>  LIST_PROFILE
+OC:[[ -f LIST_PROFIL        ]]  &&  cat  LIST_PROFIL     >>  LIST_PROFILE
+#
+# Combine all particle information files
+OC:[[ -f PARTICLE_INFOS/_0000 ]]  &&  cat  PARTICLE_INFOS/* >> PARTICLE_INFO
+#
+# tar all 3D-plot-data files in case that compressed output is switched on
+OC:[[ -f PLOT3D_COMPRESSED  ]]  &&  tar cf  PLOT3D_DATA  PLOT3D_DATA_*
+#
+#----------------------------------------------------------------------------
+# List of input-files
+#----------------------------------------------------------------------------
+PARIN                    in:job        d3#   $base_data/$fname/INPUT    _p3d
+PARIN                    in:job        pcr   $base_data/$fname/INPUT    _pcr
+PARIN                    in:job        d3f   $base_data/$fname/INPUT    _p3df
+TOPOGRAPHY_DATA          in:locopt     d3#:d3f   $base_data/$fname/INPUT    _topo
+BININ                    in:loc:flpe   d3f:rec   $base_data/$fname/RESTART  _d3d
+PARTICLE_RESTART_DATA_IN in:loc:flpe   prtf  $base_data/$fname/RESTART  _rprt
+DATA_1D_PR_NETCDF        in:locopt     prf   $base_data/$fname/OUTPUT   _pr     nc
+DATA_1D_SP_NETCDF        in:locopt     spf   $base_data/$fname/OUTPUT   _sp     nc
+DATA_1D_TS_NETCDF        in:locopt     tsf   $base_data/$fname/OUTPUT   _ts     nc
+DATA_1D_PTS_NETCDF       in:locopt     ptsf  $base_data/$fname/OUTPUT   _pts    nc
+DATA_2D_XY_NETCDF        in:locopt     xyf   $base_data/$fname/OUTPUT   _xy     nc
+DATA_2D_XY_AV_NETCDF     in:locopt     xyf   $base_data/$fname/OUTPUT   _xy_av  nc
+DATA_2D_XZ_NETCDF        in:locopt     xzf   $base_data/$fname/OUTPUT   _xz     nc
+DATA_2D_YZ_NETCDF        in:locopt     yzf   $base_data/$fname/OUTPUT   _yz     nc
+#DATA_3D_NETCDF           in:locopt     3df   $base_data/$fname/OUTPUT   _3d     nc
+DATA_PRT_NETCDF          in:locopt:pe  prtf  $base_data/$fname/OUTPUT   _prt
+#
+#----------------------------------------------------------------------------
+# List of output-files
+#----------------------------------------------------------------------------
+BINOUT                    out:loc:flpe restart   $base_data/$fname/RESTART  _d3d
+PARTICLE_RESTART_DATA_OUT out:loc:flpe prt#:prtf $base_data/$fname/RESTART  _rprt
+#
+RUN_CONTROL       out:loc:tr   d3#:pcr $base_data/$fname/MONITORING  _rc
+RUN_CONTROL       out:loc:tra  d3f     $base_data/$fname/MONITORING  _rc
+HEADER            out:loc:tr   d3#:pcr $base_data/$fname/MONITORING  _header
+HEADER            out:loc:tra  d3f     $base_data/$fname/MONITORING  _header
+CPU_MEASURES      out:loc:tr   d3#:pcr $base_data/$fname/MONITORING  _cpu
+CPU_MEASURES      out:loc:tra  d3f     $base_data/$fname/MONITORING  _cpu
+DVRP_LOG          out:loc:tr   dv#     $base_data/$fname/MONITORING  _dvrp_log
+DVRP_LOG          out:loc:tra  dvf     $base_data/$fname/MONITORING  _dvrp_log
+PARTICLE_INFO     out:loc:tr   pt#     $base_data/$fname/MONITORING  _prt_info
+PARTICLE_INFO     out:loc:tra  ptf     $base_data/$fname/MONITORING  _prt_info
+LIST_PROFIL       out:loc:tr   d3#     $base_data/$fname/MONITORING  _list_pr
+#
+DATA_1D_PR_NETCDF out:loc:tr   pr#:prf $base_data/$fname/OUTPUT      _pr  nc
+#DATA_1D_PR_NETCDF out:loc      pr#:prf $base_data/$fname/OUTPUT      _pr  nc
+DATA_1D_SP_NETCDF out:loc:tr   sp#:spf $base_data/$fname/OUTPUT      _sp  nc
+#DATA_1D_SP_NETCDF out:loc      sp#:spf $base_data/$fname/OUTPUT      _sp  nc
+DATA_1D_TS_NETCDF out:loc:tr   ts#:tsf $base_data/$fname/OUTPUT      _ts  nc
+#DATA_1D_TS_NETCDF out:loc      ts#:tsf $base_data/$fname/OUTPUT      _ts  nc
+DATA_1D_PTS_NETCDF out:loc     pts#:ptsf $base_data/$fname/OUTPUT      _pts  nc
+DATA_1D_PTS_NETCDF out:loc:tr  pts#:ptsf $base_data/$fname/OUTPUT      _pts  nc
+#DATA_2D_XY_NETCDF out:loc:tr   xy#:xyf $base_data/$fname/OUTPUT      _xy  nc
+DATA_2D_XY_NETCDF out:loc      xy#:xyf $base_data/$fname/OUTPUT      _xy  nc
+DATA_2D_XY_AV_NETCDF out:loc:tr   xy#:xyf $base_data/$fname/OUTPUT      _xy_av  nc
+#DATA_2D_XZ_NETCDF out:loc:tr   xz#:xzf $base_data/$fname/OUTPUT      _xz  nc
+DATA_2D_XZ_NETCDF out:loc      xz#:xzf $base_data/$fname/OUTPUT      _xz  nc
+DATA_2D_XZ_AV_NETCDF out:loc:tr   xz#:xzf $base_data/$fname/OUTPUT      _xz_av  nc
+#DATA_2D_YZ_NETCDF out:loc:tr   yz#:yzf $base_data/$fname/OUTPUT      _yz  nc
+DATA_2D_YZ_NETCDF out:loc      yz#:yzf $base_data/$fname/OUTPUT      _yz  nc
+DATA_2D_YZ_AV_NETCDF out:loc:tr   yz#:yzf $base_data/$fname/OUTPUT      _yz_av  nc
+DATA_3D_NETCDF    out:loc:tr   3d#:3df $base_data/$fname/OUTPUT      _3d  nc
+DATA_3D_AV_NETCDF    out:loc:tr   3d#:3df $base_data/$fname/OUTPUT      _3d_av  nc
+#DATA_3D_NETCDF    out:loc      3d#:3df $base_data/$fname/OUTPUT      _3d  nc
+DATA_PRT_NETCDF   out:loc:pe   prt#:prtf $base_data/$fname/OUTPUT    _prt
+DATA_PRT_NETCDF   out:loc:trpe prt#:prtf $base_data/$fname/OUTPUT    _prt
+DATA_DVR          out:loc:trpe dvr     $base_data/$fname/OUTPUT      _dvr
+PLOTTS_PAR        out:loc:tr   ts#:tsf $base_data/$fname/OUTPUT      _ts_par
+PLOTTS_DATA       out:loc:tr   ts#     $base_data/$fname/OUTPUT      _ts_in
+PLOTTS_DATA       out:loc:tra  tsf     $base_data/$fname/OUTPUT      _ts_in
+PLOT1D_PAR        out:loc:tr   pr#:prf $base_data/$fname/OUTPUT      _pr_par
+PLOT1D_DATA       out:loc:tr   pr#     $base_data/$fname/OUTPUT      _pr_in
+PLOT1D_DATA       out:loc:tr   prf     $base_data/$fname/OUTPUT      _pr_in
+PLOTSP_X_PAR      out:loc:tr   spx     $base_data/$fname/OUTPUT      _spx_par
+PLOTSP_X_DATA     out:loc:tr   spx     $base_data/$fname/OUTPUT      _spx_in
+PLOTSP_Y_PAR      out:loc:tr   spy     $base_data/$fname/OUTPUT      _spy_par
+PLOTSP_Y_DATA     out:loc:tr   spy     $base_data/$fname/OUTPUT      _spy_in
+#PLOT2D_XY_GLOBAL  out:loc:tr   xy      $base_data/$fname/OUTPUT      _xy_par
+#PLOT2D_XY         out:loc:tr   xy      $base_data/$fname/OUTPUT      _xy_in
+#PLOT2D_XZ_GLOBAL  out:loc:tr   xz      $base_data/$fname/OUTPUT      _xz_par
+#PLOT2D_XZ         out:loc:tr   xz      $base_data/$fname/OUTPUT      _xz_in
+#PLOT2D_YZ_GLOBAL  out:loc:tr   yz      $base_data/$fname/OUTPUT      _yz_par
+#PLOT2D_YZ         out:loc:tr   yz      $base_data/$fname/OUTPUT      _yz_in
+PLOT3D_FLD        out:loc:tr   avs     $base_data/$fname/OUTPUT      _fld  fld
+PLOT3D_COOR       out:loc:tr   avs     $base_data/$fname/OUTPUT      _avscor
+PLOT3D_DATA       out:loc:tr   avs     $base_data/$fname/OUTPUT      _avs
+PARTICLE_DATA     out:loc:flpe prt#:prtf $base_data/$fname/OUTPUT    _prt_dat
+#
+# Output-example for using more than one statistical region
+#PLOTTS_PAR_0      out:loc:tr   ts#:tsf $base_data/$fname/OUTPUT      _ts_0_par
+#PLOTTS_DATA_0     out:loc:tr   ts#     $base_data/$fname/OUTPUT      _ts_0_in
+#PLOTTS_DATA_0     out:loc:tra  tsf     $base_data/$fname/OUTPUT      _ts_0_in
+#PLOTTS_PAR_1      out:loc:tr   ts#:tsf $base_data/$fname/OUTPUT      _ts_1_par
+#PLOTTS_DATA_1     out:loc:tr   ts#     $base_data/$fname/OUTPUT      _ts_1_in
+#PLOTTS_DATA_1     out:loc:tra  tsf     $base_data/$fname/OUTPUT      _ts_1_in
+#PLOTTS_PAR_2      out:loc:tr   ts#:tsf $base_data/$fname/OUTPUT      _ts_2_par
+#PLOTTS_DATA_2     out:loc:tr   ts#     $base_data/$fname/OUTPUT      _ts_2_in
+#PLOTTS_DATA_2     out:loc:tra  tsf     $base_data/$fname/OUTPUT      _ts_2_in
+PLOT1D_PAR_0      out:loc:tr   pr#:prf $base_data/$fname/OUTPUT      _pr_0_par
+PLOT1D_DATA_0     out:loc:tr   pr#     $base_data/$fname/OUTPUT      _pr_0_in
+PLOT1D_PAR_1      out:loc:tr   pr#:prf $base_data/$fname/OUTPUT      _pr_1_par
+PLOT1D_DATA_1     out:loc:tr   pr#     $base_data/$fname/OUTPUT      _pr_1_in
+PLOT1D_PAR_2      out:loc:tr   pr#:prf $base_data/$fname/OUTPUT      _pr_2_par
+PLOT1D_DATA_2     out:loc:tr   pr#     $base_data/$fname/OUTPUT      _pr_2_in
+PLOT1D_PAR_3      out:loc:tr   pr#:prf $base_data/$fname/OUTPUT      _pr_3_par
+PLOT1D_DATA_3     out:loc:tr   pr#     $base_data/$fname/OUTPUT      _pr_3_in
+PLOT1D_PAR_4      out:loc:tr   pr#:prf $base_data/$fname/OUTPUT      _pr_4_par
+PLOT1D_DATA_4     out:loc:tr   pr#     $base_data/$fname/OUTPUT      _pr_4_in
+PLOTTS_PAR_0      out:loc:tr   ts#:tsf $base_data/$fname/OUTPUT      _ts_par
+PLOTTS_DATA_0     out:loc:tr   ts#     $base_data/$fname/OUTPUT      _ts_in
+PLOTTS_DATA_0     out:loc:tra  tsf     $base_data/$fname/OUTPUT      _ts_in
+#
+#----------------------------------------------------------------------------
+# List of input-files for coupled ocean model
+#----------------------------------------------------------------------------
+PARIN_O                  in:job        d3o#   $base_data/$fname/INPUT  _o_p3d
+PARIN_O                  in:job        d3of   $base_data/$fname/INPUT  _o_p3df
+#
+#----------------------------------------------------------------------------
+# List of output-files for coupled ocean model
+#----------------------------------------------------------------------------
+RUN_CONTROL_O     out:loc:tr   d3o#     $base_data/$fname/MONITORING  _o_rc
+RUN_CONTROL_O     out:loc:tra  d3of     $base_data/$fname/MONITORING  _o_rc
+HEADER_O          out:loc:tr   d3o#     $base_data/$fname/MONITORING  _o_header
+HEADER_O          out:loc:tra  d3of     $base_data/$fname/MONITORING  _o_header
+CPU_MEASURES_O    out:loc:tr   d3o#     $base_data/$fname/MONITORING  _o_cpu
+CPU_MEASURES_O    out:loc:tra  d3of     $base_data/$fname/MONITORING  _o_cpu
+LIST_PROFIL_O     out:loc:tr   d3o#     $base_data/$fname/MONITORING  _o_list_pr
+#
+DATA_1D_PR_NETCDF_O    out:loc:tr pro#:prof   $base_data/$fname/OUTPUT _o_pr  nc
+DATA_1D_SP_NETCDF_O    out:loc:tr spo#:spof   $base_data/$fname/OUTPUT _o_sp  nc
+DATA_1D_TS_NETCDF_O    out:loc:tr tso#:tsof   $base_data/$fname/OUTPUT _o_ts  nc
+DATA_1D_PTS_NETCDF_O   out:loc:tr ptso#:ptsof $base_data/$fname/OUTPUT _o_pts nc
+DATA_2D_XY_NETCDF_O    out:loc:tr xyo#:xyof   $base_data/$fname/OUTPUT _o_xy  nc
+DATA_2D_XY_AV_NETCDF_O out:loc:tr xyo#:xyof   $base_data/$fname/OUTPUT _o_xy_av  nc
+DATA_2D_XZ_NETCDF_O    out:loc:tr xzo#:xzof   $base_data/$fname/OUTPUT _o_xz  nc
+DATA_2D_XZ_AV_NETCDF_O out:loc:tr xzo#:xzof   $base_data/$fname/OUTPUT _o_xz_av  nc
+DATA_2D_YZ_NETCDF_O    out:loc:tr yzo#:yzof   $base_data/$fname/OUTPUT _o_yz  nc
+DATA_2D_YZ_AV_NETCDF_O out:loc:tr yzo#:yzof   $base_data/$fname/OUTPUT _o_yz_av  nc
Index: /palm/trunk/SCRIPTS/batch_scp
===================================================================
--- /palm/trunk/SCRIPTS/batch_scp	(revision 692)
+++ /palm/trunk/SCRIPTS/batch_scp	(revision 693)
@@ -45,4 +45,8 @@
      # 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,4 +64,6 @@
  get=false
  local_host=`hostname`
+ local_user=$USER
+ local_wdir=`pwd`
  locat=normal
  make_catalog=false
@@ -286,5 +292,10 @@
 
     # 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,5 +502,10 @@
  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,4 +558,12 @@
                 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,5 +583,10 @@
              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,5 +600,10 @@
           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,5 +613,10 @@
              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,5 +632,10 @@
           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,10 +652,20 @@
        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,5 +686,10 @@
        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
Index: /palm/trunk/SCRIPTS/mbuild
===================================================================
--- /palm/trunk/SCRIPTS/mbuild	(revision 692)
+++ /palm/trunk/SCRIPTS/mbuild	(revision 693)
@@ -117,5 +117,6 @@
      # 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,4 +480,5 @@
         (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,5 +1065,5 @@
           fi
 
-          if [[ $remote_host = ibms  ||  $remote_host = ibmy ]]
+          if [[ $remote_host = ibmkisti  ||  $remote_host = ibms  ||  $remote_host = ibmy ]]
           then
 
Index: /palm/trunk/SCRIPTS/mrun
===================================================================
--- /palm/trunk/SCRIPTS/mrun	(revision 692)
+++ /palm/trunk/SCRIPTS/mrun	(revision 693)
@@ -219,5 +219,6 @@
      # 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,5 +305,9 @@
  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,5 +675,5 @@
     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,5 +839,5 @@
                    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,5 +1104,5 @@
     # 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,5 +1121,5 @@
     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,5 +1150,5 @@
        # 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,4 +1263,5 @@
     case  $host  in
         (ibmh)       queue=no_class;;
+        (ibmkisti)   queue=class.32plus;;
         (ibmy)       queue=parallel;;
         (lckyoto)    queue=ph;;
@@ -2990,4 +2996,12 @@
     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,5 +3077,5 @@
              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,5 +3089,5 @@
              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,5 +3111,5 @@
           then
                 # SETUP THE IBM MPI ENVIRONMENT
-             if [[ $host != ibmh ]]
+             if [[ $host != ibmh  &&  $host != ibmkisti ]]
              then
                 export MP_SHARED_MEMORY=yes
@@ -3112,4 +3126,13 @@
                 [[ $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,5 +3164,5 @@
                 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,5 +3336,11 @@
                       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,7 +3369,7 @@
                       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,5 +4265,5 @@
           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,5 +4274,10 @@
                    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,5 +4367,5 @@
 
        # 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,5 +4419,5 @@
        # 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,6 +4431,19 @@
 
           # 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,7 +4503,7 @@
           # 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,6 +4561,7 @@
     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
 
Index: /palm/trunk/SCRIPTS/subjob
===================================================================
--- /palm/trunk/SCRIPTS/subjob	(revision 692)
+++ /palm/trunk/SCRIPTS/subjob	(revision 693)
@@ -127,4 +127,5 @@
      #                    institute of technology (lctit)
      # 02/02/11 - Siggi - further asjustments for Tsubame concerning openMP
+     # 06/03/11 - Siggi - adjustments for ibmkisti
 
 
@@ -204,4 +205,5 @@
      (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,4 +211,5 @@
      (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,5 +300,5 @@
     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,4 +366,5 @@
         (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,4 +378,5 @@
         (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,4 +401,8 @@
         (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,8 +598,4 @@
  else
     remote_dayfile=/dev/null
-    if [[ $(echo $remote_host | cut -c1-3) = ibm ]]
-    then
-       notification='# @ notification = never'
-    fi
  fi
 
@@ -610,5 +615,16 @@
     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,4 +634,14 @@
        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,9 +667,9 @@
 
 # @ 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,5 +677,8 @@
 $network_to_use
 $data_limit
+$rset
+$mcm_affinity_options
 $notification
+$notify_user
 
 %%END%%
@@ -658,5 +687,8 @@
     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,4 +697,15 @@
 
 %%END%%
+
+       else
+
+          cat >> $job_to_send << %%END%%
+# @ total_tasks = $numprocs
+# @ blocking = unlimited
+# @ queue
+
+%%END%%
+
+       fi
 
     else
@@ -762,4 +805,34 @@
 
 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,4 +1153,7 @@
        then
           return_queue=c1
+       elif [[ $remote_host = ibmkisti ]]
+       then
+          return_queue=class.1-2
        elif [[ $remote_host = ibmku ]]
        then
@@ -1332,5 +1408,5 @@
        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
Index: /palm/trunk/SOURCE/pres.f90
===================================================================
--- /palm/trunk/SOURCE/pres.f90	(revision 692)
+++ /palm/trunk/SOURCE/pres.f90	(revision 693)
@@ -4,4 +4,5 @@
 ! Current revisions:
 ! -----------------
+! bugfix: weighting coefficient added to ibm branch
 !
 ! Former revisions:
@@ -291,5 +292,7 @@
     ENDDO
 
-    localsum = ( localsum + threadsum ) * dt_3d
+    localsum = ( localsum + threadsum ) * dt_3d * &
+               weight_pres(intermediate_timestep_count)
+
     !$OMP END PARALLEL
 #else
