*** globus-script-pbs-submit.original	Tue Dec  4 16:50:29 2001
--- globus-script-pbs-submit	Wed May  8 12:11:17 2002
***************
*** 33,39 ****
  PBS_JOB_OUT="${PBS_JOB_SCRIPT}.out"
  PBS_JOB_ERR="${PBS_JOB_SCRIPT}.err"
  
! is_cluster=false
  
  arg_file=$1
  
--- 33,39 ----
  PBS_JOB_OUT="${PBS_JOB_SCRIPT}.out"
  PBS_JOB_ERR="${PBS_JOB_SCRIPT}.err"
  
! is_cluster=true
  
  arg_file=$1
  
***************
*** 212,218 ****
  
  echo "#PBS -o $grami_stdout" >> $PBS_JOB_SCRIPT
  echo "#PBS -e $grami_stderr" >> $PBS_JOB_SCRIPT
! echo "#PBS -l ncpus=$grami_count" >> $PBS_JOB_SCRIPT
  
  # Uncomment the following lines if your pbs allows node count specification
  #if [ $grami_host_count -ne 0 ] ; then
--- 212,218 ----
  
  echo "#PBS -o $grami_stdout" >> $PBS_JOB_SCRIPT
  echo "#PBS -e $grami_stderr" >> $PBS_JOB_SCRIPT
! echo "#PBS -l nodes=$grami_count" >> $PBS_JOB_SCRIPT
  
  # Uncomment the following lines if your pbs allows node count specification
  #if [ $grami_host_count -ne 0 ] ; then
***************
*** 227,242 ****
--- 227,245 ----
  #required for this scheduling system.
  #
  new_grami_env=""
+ pbs_new_grami_env=""
  if [ ! -z "${grami_env}" ] ; then
     eval set -- ${grami_env}
     x=0
     while [ "$#" -ne 0 ]; do
         if [ $x = 0 ] ; then
            new_grami_env="${new_grami_env}$1"
+           pbs_new_grami_env="${pbs_new_grami_env}$1"
            x=1
         else
            x=0
            new_grami_env="${new_grami_env}=$1,"
+           pbs_new_grami_env="${pbs_new_grami_env}=$1 "
         fi
         shift
     done
***************
*** 302,307 ****
--- 305,313 ----
  $DEBUG_ECHO PBS job script successfully built >> $grami_logfile
  $DEBUG_ECHO submitting PBS job script >> $grami_logfile
  
+ $DEBUG_ECHO BEGIN PBS job script --- >> $grami_logfile
+ cat $PBS_JOB_SCRIPT >> $grami_logfile
+ $DEBUG_ECHO END PBS job script --- >> $grami_logfile
  # Execute qsub command