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

Timestamp:

Feb 28, 2016 12:45:19 PM (8 years ago)

Author:

raasch

Message:

update of the nested domain system + some bugfixes

File:

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

palm/trunk/SOURCE/init_pegrid.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-!
+! cpp-statements for nesting removed
 ! 
 ! Former revisions:
@@ -151 +151 @@
     USE pegrid
  
-#if defined( PMC_ACTIVE )
     USE pmc_interface,                                                         &
-        ONLY:  cpl_npex,cpl_npey
-#endif
+        ONLY:  cpl_npex, cpl_npey, nested_run
 
     USE transpose_indices,                                                     &
@@ -215 +213 @@
     CALL location_message( 'creating virtual PE grids + MPI derived data types', &
                            .FALSE. )
-#if defined( PMC_ACTIVE )
-!
-!-- In case of nested-domain runs, the processor grid is explicitly given
-!-- by the user in the nestpar-NAMELIST
-    pdims(1) = cpl_npex
-    pdims(2) = cpl_npey
-#else
-!
-!-- Determine the processor topology or check it, if prescribed by the user
-    IF ( npex == -1  .AND.  npey == -1 )  THEN
-
-!
-!--    Automatic determination of the topology
-       numproc_sqr = SQRT( REAL( numprocs, KIND=wp ) )
-       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
-
-!
-!--    Prescribed by user. Number of processors on the prescribed topology
-!--    must be equal to the number of PEs available to the job
-       IF ( ( npex * npey ) /= numprocs )  THEN
-          WRITE( message_string, * ) 'number of PEs of the prescribed ',      & 
+
+    IF ( nested_run )  THEN
+!
+!--    In case of nested-domain runs, the processor grid is explicitly given
+!--    by the user in the nestpar-NAMELIST
+       pdims(1) = cpl_npex
+       pdims(2) = cpl_npey
+
+    ELSE
+!
+!--    Determine the processor topology or check it, if prescribed by the user
+       IF ( npex == -1  .AND.  npey == -1 )  THEN
+
+!
+!--       Automatic determination of the topology
+          numproc_sqr = SQRT( REAL( numprocs, KIND=wp ) )
+          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
+
+!
+!--       Prescribed by user. Number of processors on the prescribed topology
+!--       must be equal to the number of PEs available to the job
+          IF ( ( npex * npey ) /= numprocs )  THEN
+             WRITE( message_string, * ) 'number of PEs of the prescribed ',   &
                  'topology (', npex*npey,') does not match & the number of ', & 
                  'PEs available to the job (', numprocs, ')'
-          CALL message( 'init_pegrid', 'PA0221', 1, 2, 0, 6, 0 )
-       ENDIF
-       pdims(1) = npex
-       pdims(2) = npey
-
-    ELSE
-!
-!--    If the processor topology is prescribed by the user, the number of
-!--    PEs must be given in both directions
-       message_string = 'if the processor topology is prescribed by the, ' //  &
-                   ' user& both values of "npex" and "npey" must be given ' // &
-                   'in the &NAMELIST-parameter file'
-       CALL message( 'init_pegrid', 'PA0222', 1, 2, 0, 6, 0 )
-
-    ENDIF
-#endif
+             CALL message( 'init_pegrid', 'PA0221', 1, 2, 0, 6, 0 )
+          ENDIF
+          pdims(1) = npex
+          pdims(2) = npey
+
+       ELSE
+!
+!--       If the processor topology is prescribed by the user, the number of
+!--       PEs must be given in both directions
+          message_string = 'if the processor topology is prescribed by th' //  &
+                   'e user& both values of "npex" and "npey" must be given' // &
+                   ' in the &NAMELIST-parameter file'
+          CALL message( 'init_pegrid', 'PA0222', 1, 2, 0, 6, 0 )
+
+       ENDIF
+
+    ENDIF
+
 
 !
@@ -1082 +1084 @@
        ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
           outflow_l = .TRUE.
-#if defined( PMC_ACTIVE )
        ELSEIF ( bc_lr == 'nested' )  THEN
           nest_bound_l = .TRUE.
-#endif
        ENDIF
     ENDIF
@@ -1094 +1094 @@
        ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
           inflow_r  = .TRUE.
-#if defined( PMC_ACTIVE )
        ELSEIF ( bc_lr == 'nested' )  THEN
           nest_bound_r = .TRUE.
-#endif
        ENDIF
     ENDIF
@@ -1106 +1104 @@
        ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
           inflow_s  = .TRUE.
-#if defined( PMC_ACTIVE )
        ELSEIF ( bc_ns == 'nested' )  THEN
           nest_bound_s = .TRUE.
-#endif
        ENDIF
     ENDIF
@@ -1118 +1114 @@
        ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
           outflow_n = .TRUE.
-#if defined( PMC_ACTIVE )
        ELSEIF ( bc_ns == 'nested' )  THEN
           nest_bound_n = .TRUE.
-#endif
        ENDIF
     ENDIF