Changeset 246 for palm/trunk/SCRIPTS/mrun

Timestamp:

Feb 27, 2009 11:42:39 AM (16 years ago)

Author:

raasch

Message:

further changes for dvrp clipping

File:

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

palm/trunk/SCRIPTS/mrun

@@ -168 +168 @@
      # 13/01/09 - Siggi  - totalview on hice/bice can be used in debug mode
      #                     using environment variable totalview
+     # 25/02/09 - Siggi  - cputime-option (-t) is allowed to be omitted for
+     #                     interactive runs
 
 
@@ -253 +255 @@
     echo "+++ WARNING: return_addres changed to $return_addres !!!!!"
  fi
-# if [[ $return_addres = 210.117.65.1 ]]
-# if [[ $(nslookup `hostname` 2>&1 | grep -c 210.117.65.1) = 1 ]]
-# then
-#    [[ $localhost_realname = gfdl3.yonsei.ac.kr ]]  &&  return_addres=165.132.26.56
-# fi
  return_password=""
  return_username=$LOGNAME
@@ -1973 +1970 @@
     if (( $cputime == 0 ))
     then
-       printf "\n  +++ cpu-time is undefined"
-       printf "\n  >>> Please type CPU-time in seconds as INTEGER:"
-       printf "\n  >>> "
-       read  cputime  1>/dev/null  2>&1
+       if [[ $do_batch = true ]]
+       then
+          printf "\n  +++ cpu-time is undefined"
+          printf "\n  >>> Please type CPU-time in seconds as INTEGER:"
+          printf "\n  >>> "
+          read  cputime  1>/dev/null  2>&1
+       else
+          cputime=10000000   # NO CPU LIMIT FOR INTERACTIVE RUNS
+       fi
     else
        done=true
@@ -3011 +3013 @@
              (( ii = $numprocs / $threads_per_task ))
              export OMP_NUM_THREADS=$threads_per_task
-             echo "OMP_NUM_THREADS=$OMP_NUM_THREADS"
+#             echo "OMP_NUM_THREADS=$OMP_NUM_THREADS"
              if [[ $threads_per_task != 1 ]]
              then