Changeset 206 for palm/trunk/SOURCE/init_pegrid.f90

Timestamp:

Oct 13, 2008 2:59:11 PM (16 years ago)

Author:

raasch

Message:

ocean-atmosphere coupling realized with MPI-1, adjustments in mrun, mbuild, subjob for lcxt4

File:

• palm/trunk/SOURCE/init_pegrid.f90 (modified) (4 diffs)

palm/trunk/SOURCE/init_pegrid.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
+! Implementation of a MPI-1 coupling: added __parallel within the __mpi2 part
+! 2d-decomposition is default on SGI-ICE systems
 ! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!!
 ! TEST OUTPUT (TO BE REMOVED) logging mpi2 ierr values
@@ -93 +95 @@
 !--    Automatic determination of the topology
 !--    The default on SMP- and cluster-hosts is a 1d-decomposition along x
-       IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 'nec'  .OR. &
-            host(1:2) == 'lc'   .OR.  host(1:3) == 'dec' )  THEN
+       IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 'nec'      .OR. &
+            ( host(1:2) == 'lc'  .AND.  host(3:5) /= 'sgi' )  .OR. &
+             host(1:3) == 'dec' )  THEN
 
           pdims(1) = numprocs
@@ -540 +543 @@
 #endif
 
+#if defined( __parallel )
 #if defined( __mpi2 )
 !
@@ -623 +627 @@
 
     ENDIF
+#endif
 
 !