Changeset 2600 for palm/trunk/SOURCE

Timestamp:

Nov 1, 2017 2:11:20 PM (7 years ago)

Author:

raasch

Message:

small changes concerning r2599, cycle number are now three digits wide

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (2 diffs)
• init_pegrid.f90 (modified) (3 diffs)
• parin.f90 (modified) (4 diffs)

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# comment line concerning bound checks removed
+# 
+# 2599 2017-11-01 13:18:45Z hellstea
 # virtual_flight_mod.o, synthetic_turbulence_generator_mod.o and
 # wind_turbine_model_mod.o were added to read_var_list.o
@@ -446 +449 @@
 # The following line is needed for palm_simple_install, don't remove it!
 #to_be_replaced_by_include
-
-#BOUNDS="-Rbc"  # Array bounds checking. Compromises performance seriously.
 
 .SUFFIXES:

palm/trunk/SOURCE/init_pegrid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! calculation of block-I/O quantitites removed (is now done in parin)
+! 
+! 2516 2017-10-04 11:03:04Z suehring
 ! Remove tabs
 ! 
@@ -209 +212 @@
                coupling_topology, gathered_size, grid_level,                   &
                grid_level_count, inflow_l, inflow_n, inflow_r, inflow_s,       &
-               io_blocks, io_group, maximum_grid_level,                        &
-               maximum_parallel_io_streams, message_string,                    &
+               maximum_grid_level, message_string,                             &
                mg_switch_to_pe0_level, momentum_advec, nest_bound_l,           &
                nest_bound_n, nest_bound_r, nest_bound_s, nest_domain, neutral, &
@@ -1372 +1374 @@
     ENDIF
 
-!
-!-- Calculate the number of groups into which parallel I/O is split.
-!-- The default for files which are opened by all PEs (or where each
-!-- PE opens his own independent file) is, that all PEs are doing input/output
-!-- in parallel at the same time. This might cause performance or even more
-!-- severe problems depending on the configuration of the underlying file
-!-- system.
-!-- First, set the default:
-    IF ( maximum_parallel_io_streams == -1  .OR. &
-         maximum_parallel_io_streams > numprocs )  THEN
-       maximum_parallel_io_streams = numprocs
-    ENDIF
-
-!
-!-- Now calculate the number of io_blocks and the io_group to which the
-!-- respective PE belongs. I/O of the groups is done in serial, but in parallel
-!-- for all PEs belonging to the same group. A preliminary setting with myid
-!-- based on MPI_COMM_WORLD has been done in parin.
-    io_blocks = numprocs / maximum_parallel_io_streams
-    io_group  = MOD( myid+1, io_blocks )
-    
-
  END SUBROUTINE init_pegrid

palm/trunk/SOURCE/parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! some comments added and variables renamed concerning r2599
+! 
+! 2599 2017-11-01 13:18:45Z hellstea
 ! The i/o grouping is updated to work correctly also in nested runs.
 ! 
@@ -391 +394 @@
     IMPLICIT NONE
 
-    INTEGER(iwp) ::  i      !<
-    INTEGER(iwp) ::  ioerr  !< error flag for open/read/write
-    INTEGER(iwp) ::  myworldid       !<
-    INTEGER(iwp) ::  numworldprocs   !<
+    INTEGER(iwp) ::  global_id      !< process id with respect to MPI_COMM_WORLD
+    INTEGER(iwp) ::  global_procs   !< # of procs with respect to MPI_COMM_WORLD
+    INTEGER(iwp) ::  i              !<
+    INTEGER(iwp) ::  ioerr          !< error flag for open/read/write
 
     NAMELIST /inipar/  aerosol_bulk, alpha_surface, approximation, bc_e_b,     &
@@ -524 +527 @@
 !-- severe problems depending on the configuration of the underlying file
 !-- system.
+!-- Calculation of the number of blocks and the I/O group must be based on all
+!-- PEs involved in this run. Since myid and numprocs are related to the
+!-- comm2d communicator, which gives only a subset of all PEs in case of
+!-- nested runs, that information must be inquired again from the global
+!-- communicator.
 !-- First, set the default:
-    CALL MPI_COMM_RANK( MPI_COMM_WORLD, myworldid, ierr ) 
-    CALL MPI_COMM_SIZE( MPI_COMM_WORLD, numworldprocs, ierr )
+    CALL MPI_COMM_RANK( MPI_COMM_WORLD, global_id, ierr )
+    CALL MPI_COMM_SIZE( MPI_COMM_WORLD, global_procs, ierr )
     IF ( maximum_parallel_io_streams == -1  .OR.                               &
-         maximum_parallel_io_streams > numworldprocs )  THEN
-       maximum_parallel_io_streams = numworldprocs
+         maximum_parallel_io_streams > global_procs )  THEN
+       maximum_parallel_io_streams = global_procs
     ENDIF
 !
@@ -535 +543 @@
 !-- respective PE belongs. I/O of the groups is done in serial, but in parallel
 !-- for all PEs belonging to the same group.
-!-- These settings are repeated in init_pegrid for the communicator comm2d,
-!-- which is not available here
-    !io_blocks = numprocs / maximum_parallel_io_streams
-    io_blocks = numworldprocs / maximum_parallel_io_streams
-    !io_group  = MOD( myid+1, io_blocks )
-    io_group  = MOD( myworldid+1, io_blocks )
+    io_blocks = global_procs / maximum_parallel_io_streams
+    io_group  = MOD( global_id+1, io_blocks )
     
     CALL location_message( 'reading NAMELIST parameters from PARIN', .FALSE. )