Changeset 4495 for palm/trunk/SOURCE/surface_data_output_mod.f90

Timestamp:

Apr 13, 2020 8:11:20 PM (4 years ago)

Author:

raasch

Message:

restart data handling with MPI-IO added, first part

File:

• palm/trunk/SOURCE/surface_data_output_mod.f90 (modified) (8 diffs)

palm/trunk/SOURCE/surface_data_output_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! restart data handling with MPI-IO added
+! 
+! 4444 2020-03-05 15:59:50Z raasch
 ! bugfix: cpp-directives for serial mode added
 ! 
@@ -108 +111 @@
    USE control_parameters,                                                     &
        ONLY:  coupling_char, data_output_during_spinup, end_time,              &
-              message_string, run_description_header, simulated_time_at_begin, &
+              message_string, restart_data_format_output, run_description_header, simulated_time_at_begin, &
               spinup_time, surface_output
 
@@ -130 +133 @@
 
    USE pegrid
+
+   USE restart_data_mpi_io_mod,                                                                    &
+       ONLY:  rrd_mpi_io, wrd_mpi_io
 
    USE surface_mod,                                                            &
@@ -237 +243 @@
 
    INTERFACE  surface_data_output_rrd_global
-      MODULE PROCEDURE surface_data_output_rrd_global
+      MODULE PROCEDURE surface_data_output_rrd_global_ftn
+      MODULE PROCEDURE surface_data_output_rrd_global_mpi
    END INTERFACE  surface_data_output_rrd_global
 
@@ -4507 +4514 @@
     END SUBROUTINE surface_data_output_last_action
 
+
 !------------------------------------------------------------------------------!
 ! Description:
 ! ------------
-!> This routine reads globally used restart data.
+!> Read module-specific global restart data (Fortran binary format).
 !------------------------------------------------------------------------------!
-    SUBROUTINE surface_data_output_rrd_global( found )
+    SUBROUTINE surface_data_output_rrd_global_ftn( found )
 
 
@@ -4536 +4544 @@
 
 
-    END SUBROUTINE surface_data_output_rrd_global
+    END SUBROUTINE surface_data_output_rrd_global_ftn
+
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Read module-specific global restart data (MPI-IO).
+!------------------------------------------------------------------------------!
+    SUBROUTINE surface_data_output_rrd_global_mpi
+
+       CALL rrd_mpi_io( 'average_count_surf', average_count_surf )
+
+    END SUBROUTINE surface_data_output_rrd_global_mpi
+
 
 !------------------------------------------------------------------------------!
@@ -4581 +4602 @@
        IMPLICIT NONE
 
-       CALL wrd_write_string( 'average_count_surf' )
-       WRITE ( 14 )  average_count_surf
+       IF ( TRIM( restart_data_format_output ) == 'fortran_binary' )  THEN
+
+          CALL wrd_write_string( 'average_count_surf' )
+          WRITE ( 14 )  average_count_surf
+
+       ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
+
+         CALL wrd_mpi_io( 'average_count_surf', average_count_surf )
+
+       ENDIF
 
     END SUBROUTINE surface_data_output_wrd_global
@@ -4595 +4624 @@
        IMPLICIT NONE
 
-         IF ( ALLOCATED( surfaces%var_av ) )  THEN
-            CALL wrd_write_string( 'surfaces%var_av' )
-            WRITE ( 14 )  surfaces%var_av
-         ENDIF
-
+       IF ( TRIM( restart_data_format_output ) == 'fortran_binary' )  THEN
+
+          IF ( ALLOCATED( surfaces%var_av ) )  THEN
+             CALL wrd_write_string( 'surfaces%var_av' )
+             WRITE ( 14 )  surfaces%var_av
+          ENDIF
+
+       ELSEIF ( TRIM( restart_data_format_output ) == 'mpi' )  THEN
+
+          IF ( ALLOCATED( surfaces%var_av ) )  CALL wrd_mpi_io( 'surfaces%var_av', surfaces%var_av )
+
+       ENDIF
 
     END SUBROUTINE surface_data_output_wrd_local