Changeset 4107 for palm/trunk/SOURCE/data_output_module.f90

Timestamp:

Jul 22, 2019 8:51:35 AM (5 years ago)

Author:

gronemeier

Message:

changes in data-output module (data_output_module.f90, data_output_binary_module.f90, data_output_netcdf4_module.f90, binary_to_netcdf.f90):

• add support for different output groups of MPI ranks (required for, e.g., nesting runs)
• revise output messages

File:

• palm/trunk/SOURCE/data_output_module.f90 (modified) (3 diffs)

palm/trunk/SOURCE/data_output_module.f90

@@ -136 +136 @@
 
    CHARACTER(LEN=charlen) ::  output_file_format = 'binary'  !< file format (namelist parameter)
+   CHARACTER(LEN=charlen) ::  output_file_suffix = ''        !< file suffix added to each file name
 
    CHARACTER(LEN=800) ::  internal_error_message = '' !< string containing the last error message
@@ -142 +143 @@
    INTEGER(iwp) ::  debug_output_unit  !< Fortran Unit Number of the debug-output file
    INTEGER(iwp) ::  nf                 !< number of files
+   INTEGER      ::  master_rank = 0    !< master rank for tasks to be executed by single PE only
+   INTEGER      ::  output_group_comm  !< MPI communicator addressing all MPI ranks which participate in output
 
    INTEGER(iwp), PARAMETER ::  no_var_id = -1  !< value of var_id if no variable is selected
@@ -223 +226 @@
 !> Initialize data-output module
 !--------------------------------------------------------------------------------------------------!
-SUBROUTINE dom_init( program_debug_output_unit, debug_output )
-
-   INTEGER(iwp), INTENT(IN) ::  program_debug_output_unit  !< file unit number for debug output
+SUBROUTINE dom_init( file_suffix_of_output_group, mpi_comm_of_output_group, master_output_rank, &
+                     program_debug_output_unit, debug_output )
+
+   CHARACTER(LEN=*), INTENT(IN), OPTIONAL ::  file_suffix_of_output_group  !< file-name suffix added to each file;
+                                                                           !> must be unique for each output group
+
+   INTEGER, INTENT(IN), OPTIONAL ::  master_output_rank         !< MPI rank executing tasks which must
+                                                                !> be executed by a single PE only
+   INTEGER, INTENT(IN)           ::  mpi_comm_of_output_group   !< MPI communicator specifying the MPI group
+                                                                !> which participate in the output
+   INTEGER, INTENT(IN)           ::  program_debug_output_unit  !< file unit number for debug output
 
    LOGICAL, INTENT(IN) ::  debug_output  !< if true, debug output is printed
 
 
+   IF ( PRESENT( file_suffix_of_output_group ) )  output_file_suffix = file_suffix_of_output_group
+   IF ( PRESENT( master_output_rank ) )  master_rank = master_output_rank
+
+   output_group_comm = mpi_comm_of_output_group
+
    debug_output_unit = program_debug_output_unit
-
    print_debug_output = debug_output
 
-   CALL binary_init_module( debug_output_unit, debug_output, no_var_id )
-
-   CALL netcdf4_init_module( debug_output_unit, debug_output, no_var_id )
+   CALL binary_init_module( output_file_suffix, output_group_comm, master_rank, &
+                            debug_output_unit, debug_output, no_var_id )
+
+   CALL netcdf4_init_module( output_file_suffix, output_group_comm, master_rank, &
+                            debug_output_unit, debug_output, no_var_id )
 
 END SUBROUTINE dom_init