Changeset 1108 for palm

Timestamp:

Mar 5, 2013 7:03:32 AM (11 years ago)

Author:

raasch

Message:

bugfix for r1106 + coupled runs on lckyut/lckyuh

Location:

palm/trunk

Files:

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

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# bugfix for coupled runs on lckyut/lckyuh
 #
 # Former revisions:
@@ -3543 +3543 @@
                 # COPY HOSTFILE FROM SOURCE DIRECTORY OR CREATE IT, IF IT
                 # DOES NOT EXIST
-             if [[ $host != lcsgih  &&  $host != lcsgib  &&  $host != lckyu* ]]
+             if [[ $host != lcsgih  &&  $host != lcsgib  &&  $host != lckyuh  &&  $host != lckyut ]]
              then
                 if [[ -f $hostfile ]]
@@ -3738 +3738 @@
                    elif [[ $host = lck || $host = lckordi ]]
                    then
-                         mpiexec -n $ii  ./a.out  $ROPTS < runfile_atmos &
+
+                      mpiexec -n $ii  ./a.out  $ROPTS < runfile_atmos &
+
+                   elif [[ $host = lckyu* ]]
+                   then
+
+                      mpiexec -n $ii --stdin runfile_atmos  ./a.out  $ROPTS
+
                    fi
                    wait

palm/trunk/SOURCE/header.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! bugfix for r1106
 !
 ! Former revisions:
@@ -261 +261 @@
        WRITE ( io, 101 )  mpi_type, coupling_mode
     ENDIF
+#if defined( __parallel )
     IF ( coupling_start_time /= 0.0 )  THEN
        IF ( coupling_start_time > simulated_time_at_begin )  THEN
@@ -268 +269 @@
        ENDIF
     ENDIF
+#endif
     WRITE ( io, 102 )  run_date, run_identifier, run_time, runnr, &
                        ADJUSTR( host_chr )