Changeset 732 for palm/trunk


Ignore:
Timestamp:
Jul 7, 2011 1:14:29 PM (13 years ago)
Author:
raasch
Message:

preliminary bugfix for volume flow control

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/init_3d_model.f90

    r714 r732  
    66!------------------------------------------------------------------------------!
    77! Current revisions:
    8 ! -----------------
     8! ------------------
     9! Splitting of parallel I/O
     10! Bugfix: No zero assignments to volume_flow_initial and volume_flow_area in
     11! case of normal restart runs.
    912!
    1013! Former revisions:
     
    1316!
    1417! 713 2011-03-30 14:21:21Z suehring
    15 ! Reformulate weight_substep and weight_pres as broken numbers.
     18! weight_substep and weight_pres are given as fractions.
    1619!
    1720! 709 2011-03-30 09:31:40Z raasch
     
    10171020!
    10181021!--    Read binary data from restart file
    1019        CALL read_3d_binary
     1022!       DO  i = 0, io_blocks-1
     1023!          IF ( i == io_group )  THEN
     1024             CALL read_3d_binary
     1025!          ENDIF
     1026!#if defined( __parallel )
     1027!          CALL MPI_BARRIER( comm2d, ierr )
     1028!#endif
     1029!       ENDDO
    10201030
    10211031!
     
    11261136    IF ( conserve_volume_flow )  THEN
    11271137
    1128        volume_flow_initial_l = 0.0
    1129        volume_flow_area_l    = 0.0
    1130  
    11311138       IF  ( TRIM( initializing_actions ) == 'cyclic_fill' )  THEN
     1139
     1140          volume_flow_initial_l = 0.0
     1141          volume_flow_area_l    = 0.0
    11321142
    11331143          IF ( nxr == nx )  THEN
     
    11511161          ENDIF
    11521162
     1163#if defined( __parallel )
     1164          CALL MPI_ALLREDUCE( volume_flow_initial_l(1), volume_flow_initial(1),&
     1165                              2, MPI_REAL, MPI_SUM, comm2d, ierr )
     1166          CALL MPI_ALLREDUCE( volume_flow_area_l(1), volume_flow_area(1),      &
     1167                              2, MPI_REAL, MPI_SUM, comm2d, ierr )
     1168
     1169#else
     1170          volume_flow_initial = volume_flow_initial_l
     1171          volume_flow_area    = volume_flow_area_l
     1172#endif 
     1173
    11531174       ELSEIF ( TRIM( initializing_actions ) /= 'read_restart_data' )  THEN
     1175
     1176          volume_flow_initial_l = 0.0
     1177          volume_flow_area_l    = 0.0
    11541178
    11551179          IF ( nxr == nx )  THEN
     
    11731197          ENDIF
    11741198
    1175        ENDIF
    1176 
    11771199#if defined( __parallel )
    1178        CALL MPI_ALLREDUCE( volume_flow_initial_l(1), volume_flow_initial(1), &
    1179                            2, MPI_REAL, MPI_SUM, comm2d, ierr )
    1180        CALL MPI_ALLREDUCE( volume_flow_area_l(1), volume_flow_area(1),       &
    1181                            2, MPI_REAL, MPI_SUM, comm2d, ierr )
     1200          CALL MPI_ALLREDUCE( volume_flow_initial_l(1), volume_flow_initial(1),&
     1201                              2, MPI_REAL, MPI_SUM, comm2d, ierr )
     1202          CALL MPI_ALLREDUCE( volume_flow_area_l(1), volume_flow_area(1),      &
     1203                              2, MPI_REAL, MPI_SUM, comm2d, ierr )
    11821204
    11831205#else
    1184        volume_flow_initial = volume_flow_initial_l
    1185        volume_flow_area    = volume_flow_area_l
     1206          volume_flow_initial = volume_flow_initial_l
     1207          volume_flow_area    = volume_flow_area_l
    11861208#endif 
     1209
     1210       ENDIF
    11871211
    11881212!
Note: See TracChangeset for help on using the changeset viewer.