Changeset 1797 for palm/trunk/SOURCE/check_for_restart.f90

Timestamp:

Mar 21, 2016 4:50:28 PM (8 years ago)

Author:

raasch

Message:

Introduction of different data transfer modes; restart mechanism adjusted for nested runs; parameter consistency checks for nested runs; further formatting cleanup

File:

• palm/trunk/SOURCE/check_for_restart.f90 (modified) (5 diffs)

palm/trunk/SOURCE/check_for_restart.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! check now accounts for nesting mode
 ! 
 ! Former revisions:
@@ -70 +70 @@
                termination_time_needed, time_restart,                          &
                time_since_reference_point, write_binary
+
     USE kinds
+
     USE pegrid
 
+    USE pmc_interface,                                                         &
+        ONLY:  comm_world_nesting, cpl_id, nested_run
+
     IMPLICIT NONE
 
-
-    LOGICAL :: terminate_run_l           !<
-    LOGICAL :: do_stop_now = .FALSE.     !<
-    LOGICAL :: do_restart_now = .FALSE.  !<
+    INTEGER ::  global_communicator       !< global communicator to be used here
+
+    LOGICAL ::  terminate_run_l           !<
+    LOGICAL ::  do_stop_now = .FALSE.     !<
+    LOGICAL ::  do_restart_now = .FALSE.  !<
 
     REAL(wp) ::  remaining_time !<
@@ -96 +102 @@
     ENDIF
 
+!
+!-- Set the global communicator to be used (depends on the mode in which PALM is
+!-- running)
+    IF ( nested_run )  THEN
+       global_communicator = comm_world_nesting
+    ELSE
+       global_communicator = comm2d
+    ENDIF
+
 #if defined( __parallel )
 !
 !-- Make a logical OR for all processes. Stop the model run if at least
-!-- one processor has reached the time limit.
-    IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
-    CALL MPI_ALLREDUCE( terminate_run_l, terminate_run, 1, MPI_LOGICAL,        &
-                        MPI_LOR, comm2d, ierr )
+!-- one process has reached the time limit.
+    IF ( collective_wait )  CALL MPI_BARRIER( global_communicator, ierr )
+    CALL MPI_ALLREDUCE( terminate_run_l, terminate_run, 1, MPI_LOGICAL,     &
+                        MPI_LOR, global_communicator, ierr )
 #else
     terminate_run = terminate_run_l
@@ -164 +179 @@
 #if defined( __parallel )
 !
-!-- Make a logical OR for all processes. Stop the model run if at least
-!-- one processor has reached the time limit.
-    IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
+!-- Make a logical OR for all processes. Stop the model run if a flag file has
+!-- been detected above.
+    IF ( collective_wait )  CALL MPI_BARRIER( global_communicator, ierr )
     CALL MPI_ALLREDUCE( terminate_run_l, terminate_run, 1, MPI_LOGICAL,        &
-                        MPI_LOR, comm2d, ierr )
+                        MPI_LOR, global_communicator, ierr )
 #else
     terminate_run = terminate_run_l
@@ -256 +271 @@
 !-- the start of a continuation run, except if the user forced to stop the
 !-- run without restart
-    IF ( terminate_run  .AND.  myid == 0 .AND. .NOT. do_stop_now)  THEN
+    IF ( terminate_run  .AND.  myid == 0  .AND.  cpl_id == 1  .AND.            &
+         .NOT. do_stop_now)  THEN
 
        OPEN ( 90, FILE='CONTINUE_RUN', FORM='FORMATTED' )