Changeset 732 for palm/trunk

Timestamp:

Jul 7, 2011 1:14:29 PM (13 years ago)

Author:

raasch

Message:

preliminary bugfix for volume flow control

File:

• palm/trunk/SOURCE/init_3d_model.f90 (modified) (6 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -6 +6 @@
 !------------------------------------------------------------------------------!
 ! Current revisions:
-! -----------------
+! ------------------
+! Splitting of parallel I/O
+! Bugfix: No zero assignments to volume_flow_initial and volume_flow_area in
+! case of normal restart runs.
 !
 ! Former revisions:
@@ -13 +16 @@
 !
 ! 713 2011-03-30 14:21:21Z suehring
-! Reformulate weight_substep and weight_pres as broken numbers.
+! weight_substep and weight_pres are given as fractions.
 !
 ! 709 2011-03-30 09:31:40Z raasch
@@ -1017 +1020 @@
 !
 !--    Read binary data from restart file
-       CALL read_3d_binary
+!       DO  i = 0, io_blocks-1
+!          IF ( i == io_group )  THEN
+             CALL read_3d_binary
+!          ENDIF
+!#if defined( __parallel )
+!          CALL MPI_BARRIER( comm2d, ierr )
+!#endif
+!       ENDDO
 
 !
@@ -1126 +1136 @@
     IF ( conserve_volume_flow )  THEN
 
-       volume_flow_initial_l = 0.0
-       volume_flow_area_l    = 0.0
-  
        IF  ( TRIM( initializing_actions ) == 'cyclic_fill' )  THEN
+
+          volume_flow_initial_l = 0.0
+          volume_flow_area_l    = 0.0
 
           IF ( nxr == nx )  THEN
@@ -1151 +1161 @@
           ENDIF
 
+#if defined( __parallel )
+          CALL MPI_ALLREDUCE( volume_flow_initial_l(1), volume_flow_initial(1),&
+                              2, MPI_REAL, MPI_SUM, comm2d, ierr )
+          CALL MPI_ALLREDUCE( volume_flow_area_l(1), volume_flow_area(1),      &
+                              2, MPI_REAL, MPI_SUM, comm2d, ierr )
+
+#else
+          volume_flow_initial = volume_flow_initial_l
+          volume_flow_area    = volume_flow_area_l
+#endif  
+
        ELSEIF ( TRIM( initializing_actions ) /= 'read_restart_data' )  THEN
+
+          volume_flow_initial_l = 0.0
+          volume_flow_area_l    = 0.0
 
           IF ( nxr == nx )  THEN
@@ -1173 +1197 @@
           ENDIF
 
-       ENDIF
-
 #if defined( __parallel )
-       CALL MPI_ALLREDUCE( volume_flow_initial_l(1), volume_flow_initial(1), &
-                           2, MPI_REAL, MPI_SUM, comm2d, ierr )
-       CALL MPI_ALLREDUCE( volume_flow_area_l(1), volume_flow_area(1),       &
-                           2, MPI_REAL, MPI_SUM, comm2d, ierr )
+          CALL MPI_ALLREDUCE( volume_flow_initial_l(1), volume_flow_initial(1),&
+                              2, MPI_REAL, MPI_SUM, comm2d, ierr )
+          CALL MPI_ALLREDUCE( volume_flow_area_l(1), volume_flow_area(1),      &
+                              2, MPI_REAL, MPI_SUM, comm2d, ierr )
 
 #else
-       volume_flow_initial = volume_flow_initial_l
-       volume_flow_area    = volume_flow_area_l
+          volume_flow_initial = volume_flow_initial_l
+          volume_flow_area    = volume_flow_area_l
 #endif  
+
+       ENDIF
 
 !