Ignore:
Timestamp:
Feb 28, 2016 12:45:19 PM (5 years ago)
Author:
raasch
Message:

update of the nested domain system + some bugfixes

File:
1 edited

Legend:

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

    r1683 r1764  
    1919! Current revisions:
    2020! -----------------
    21 !
     21! abort with MPI_COMM_WORLD added, nested runs always abort with MPI_ABORT
    2222!
    2323! Former revisions:
     
    5555 
    5656
    57     USE pegrid
    58    
    5957    USE control_parameters,                                                    &
    6058        ONLY:  abort_mode, coupling_mode, coupling_mode_remote, dt_restart,    &
     
    6260               terminate_run, time_restart
    6361
     62    USE pegrid
     63
     64    USE pmc_interface,                                                         &
     65        ONLY:  nested_run
    6466
    6567#if defined( __parallel ) && ! defined ( __check )
    6668    IF ( coupling_mode == 'uncoupled' )  THEN
    67        IF ( abort_mode == 1 )  THEN
    68           CALL MPI_FINALIZE( ierr )
    69           STOP
    70        ELSEIF ( abort_mode == 2 )  THEN
    71           CALL MPI_ABORT( comm2d, 9999, ierr )
     69       IF ( nested_run )  THEN
     70!
     71!--       Workaround: If any of the nested model crashes, it aborts the whole
     72!--       run with MPI_ABORT, regardless of the reason given by abort_mode
     73          CALL MPI_ABORT( MPI_COMM_WORLD, 9999, ierr )
     74       ELSE
     75          IF ( abort_mode == 1 )  THEN
     76             CALL MPI_FINALIZE( ierr )
     77             STOP
     78          ELSEIF ( abort_mode == 2 )  THEN
     79             CALL MPI_ABORT( comm2d, 9999, ierr )
     80          ELSEIF ( abort_mode == 3 )  THEN
     81             CALL MPI_ABORT( MPI_COMM_WORLD, 9999, ierr )
     82          ENDIF
    7283       ENDIF
    7384    ELSE
Note: See TracChangeset for help on using the changeset viewer.