Changeset 1041 for palm/trunk/SOURCE

Timestamp:

Nov 6, 2012 2:36:29 AM (11 years ago)

Author:

raasch

Message:

2d virtual processor topology is used by default for all machines

File:

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

palm/trunk/SOURCE/init_pegrid.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! a 2d-topology is used by default for all machines
 !
 ! Former revisions:
@@ -184 +184 @@
 !
 !--    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'  .AND.  host(3:5) /= 'sgi'  .AND.  &
-              host(3:4) /= 'xt'  .AND.  host(3:5) /= 'tit'  .AND.  &
-              host(3:6) /= 'flow' )  .OR.  host(1:3) == 'dec' )  THEN
-
-          pdims(1) = numprocs
-          pdims(2) = 1
-
-       ELSE
-
-          numproc_sqr = SQRT( REAL( numprocs ) )
-          pdims(1)    = MAX( numproc_sqr , 1 )
-          DO  WHILE ( MOD( numprocs , pdims(1) ) /= 0 )
-             pdims(1) = pdims(1) - 1
-          ENDDO
-          pdims(2) = numprocs / pdims(1)
-
-       ENDIF
+       numproc_sqr = SQRT( REAL( numprocs ) )
+       pdims(1)    = MAX( numproc_sqr , 1 )
+       DO  WHILE ( MOD( numprocs , pdims(1) ) /= 0 )
+          pdims(1) = pdims(1) - 1
+       ENDDO
+       pdims(2) = numprocs / pdims(1)
 
     ELSEIF ( npex /= -1  .AND.  npey /= -1 )  THEN