Changeset 1609 for palm/trunk

Timestamp:

Jul 3, 2015 3:37:58 PM (9 years ago)

Author:

maronga

Message:

minor changes in mrun and bugfix in poismg_fast

Location:

palm/trunk

Files:

• SCRIPTS/mrun (modified) (3 diffs)
• SOURCE/poismg_fast.f90 (modified) (7 diffs)

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# Modified the random number of the temporary working directory to match the 
+# queuing system number on HLRN-III (lccray*).
 # 
 # Former revisions:
@@ -600 +601 @@
     # VALUE OF do_remote IS IMPORTANT FOR THE FILE CONNECTIONS.
     # IN CASE OF EXECUTION ON A REMOTE-MACHINE, A BATCH-JOB HAS
-    # TO BE SUBMITTED (I.E. do_bacth=true)
+    # TO BE SUBMITTED (I.E. do_batch=true)
  if [[ -n $host  &&  "$host" != $localhost ]]
  then
@@ -1832 +1833 @@
 
     # DETERMINE THE NAME OF MRUN'S TEMPORARY WORKING DIRECTORY
- kennung=$RANDOM
+
+    # ON HLRN-III, USE THE QUEUING NAME. OTHERWISE USE USERNAME AND RANDOM NUMBER
+ if [[ $do_batch = false && $(echo $host | cut -c1-6) = lccray ]]
+ then
+    kennung=$(checkjob $PBS_JOBID | grep Reservation | cut -d" " -s -f2 | cut -d"." -s -f2 | sed "s/['\"]//g")
+ else
+    kennung=$RANDOM
+ fi
+
  if [[ "$tmp_user_catalog" = "" ]]
  then

palm/trunk/SOURCE/poismg_fast.f90

@@ -23 +23 @@
 ! Current revisions:
 ! -----------------
-!
+! Bugfix: allow compilation without __parallel.
 !
 ! Former revisions:
@@ -55 +55 @@
     USE cpulog,                                                                &
         ONLY:  cpu_log, log_point_s
+
     USE kinds
-    USE MPI
+
     USE pegrid
 
@@ -1685 +1686 @@
 !++          ATTENTION: Check reason for this error. Remove it or replace WRITE
 !++                     by PALM message
+#if defined ( __parallel )
              IF ( ind /= ind_even_odd )  THEN
                 WRITE (0,*) 'ERROR ==> illegal ind_even_odd ',ind,ind_even_odd,l
                 CALL MPI_ABORT(MPI_COMM_WORLD,i,j)
              ENDIF
+#endif
 !
 !--          Sort the data with odd k index
@@ -2354 +2357 @@
                   nyn_mg, nzb, nzt, nzt_mg
 
-       USE pegrid,                                                             &
-           ONLY:  ngp_xz, ngp_yz
-
        IMPLICIT NONE
 
@@ -2381 +2381 @@
                            nxl_mg(grid_level-1)-1:nxr_mg(grid_level-1)+1) ::  temp  !:
 
-
+#if defined ( __parallel )
        sendrecv_in_background_save = sendrecv_in_background
        sendrecv_in_background      = .FALSE.
@@ -2865 +2865 @@
 
        ELSE
+
 !
 !--       Standard horizontal ghost boundary exchange for small coarse grid
@@ -2877 +2878 @@
        synchronous_exchange   = synchronous_exchange_save
        send_receive = 'al'
+#else
+
+!
+!--    Standard horizontal ghost boundary exchange for small coarse grid
+!--    levels, where the transfer time is latency bound
+       CALL exchange_horiz( p_mg, 1 )
+#endif
+
+
 
     END SUBROUTINE special_exchange_horiz