Changeset 206 for palm/trunk/SOURCE/surface_coupler.f90

Timestamp:

Oct 13, 2008 2:59:11 PM (16 years ago)

Author:

raasch

Message:

ocean-atmosphere coupling realized with MPI-1, adjustments in mrun, mbuild, subjob for lcxt4

File:

• palm/trunk/SOURCE/surface_coupler.f90 (modified) (14 diffs)

palm/trunk/SOURCE/surface_coupler.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Implementation of a MPI-1 Coupling: replaced myid with target_id,
+! deleted __mpi2 directives
 !
 ! Former revisions:
@@ -32 +33 @@
     REAL    ::  simulated_time_remote
 
-#if defined( __parallel )  &&  defined( __mpi2 )
+#if defined( __parallel )
 
-    CALL cpu_log( log_point(39), 'surface_coupler', 'start' )
+       CALL cpu_log( log_point(39), 'surface_coupler', 'start' )
 
 !
@@ -43 +44 @@
 !-- If necessary, the coupler will be called at the beginning of the next 
 !-- restart run.
-    CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER, myid,  0, &
-                       terminate_coupled_remote, 1, MPI_INTEGER, myid,  0, &
-                       comm_inter, status, ierr )
+    CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER, target_id,  &
+                       0, &
+                       terminate_coupled_remote, 1, MPI_INTEGER, target_id,  &
+                       0, comm_inter, status, ierr )
     IF ( terminate_coupled_remote > 0 )  THEN
        IF ( myid == 0 )  THEN
@@ -64 +66 @@
 !-- Exchange the current simulated time between the models,
 !-- currently just for testing
-    CALL MPI_SEND( simulated_time, 1, MPI_REAL, myid, 11, comm_inter, ierr )
-    CALL MPI_RECV( simulated_time_remote, 1, MPI_REAL, myid, 11, &
+    CALL MPI_SEND( simulated_time, 1, MPI_REAL, target_id, 11, &
+                   comm_inter, ierr )
+    CALL MPI_RECV( simulated_time_remote, 1, MPI_REAL, target_id, 11, &
                    comm_inter, status, ierr )
     WRITE ( 9, * )  simulated_time, ' remote: ', simulated_time_remote
@@ -78 +81 @@
        WRITE ( 9, * )  '*** send shf to ocean'
        CALL local_flush( 9 )
-       CALL MPI_SEND( shf(nys-1,nxl-1), ngp_xy, MPI_REAL, myid, 12, &
+       CALL MPI_SEND( shf(nys-1,nxl-1), ngp_xy, MPI_REAL, target_id, 12, &
                       comm_inter, ierr )
-       WRITE ( 9, * )  '    ready'
-       CALL local_flush( 9 )
 
 !
@@ -88 +89 @@
           WRITE ( 9, * )  '*** send qsws to ocean'
           CALL local_flush( 9 )
-          CALL MPI_SEND( qsws(nys-1,nxl-1), ngp_xy, MPI_REAL, myid, 13, &
+          CALL MPI_SEND( qsws(nys-1,nxl-1), ngp_xy, MPI_REAL, target_id, 13, &
                comm_inter, ierr )
-          WRITE ( 9, * )  '    ready'
-          CALL local_flush( 9 )
        ENDIF
 
@@ -98 +97 @@
        WRITE ( 9, * )  '*** receive pt from ocean'
        CALL local_flush( 9 )
-       CALL MPI_RECV( pt(0,nys-1,nxl-1), 1, type_xy, myid, 14, comm_inter, &
-                      status, ierr )
-       WRITE ( 9, * )  '    ready'
-       CALL local_flush( 9 )
+       CALL MPI_RECV( pt(0,nys-1,nxl-1), 1, type_xy, target_id, 14, &
+                      comm_inter, status, ierr )
 
 !
@@ -107 +104 @@
        WRITE ( 9, * )  '*** send usws to ocean'
        CALL local_flush( 9 )
-       CALL MPI_SEND( usws(nys-1,nxl-1), ngp_xy, MPI_REAL, myid, 15, &
+       CALL MPI_SEND( usws(nys-1,nxl-1), ngp_xy, MPI_REAL, target_id, 15, &
                       comm_inter, ierr )
-       WRITE ( 9, * )  '    ready'
-       CALL local_flush( 9 )
 
 !
@@ -116 +111 @@
        WRITE ( 9, * )  '*** send vsws to ocean'
        CALL local_flush( 9 )
-       CALL MPI_SEND( vsws(nys-1,nxl-1), ngp_xy, MPI_REAL, myid, 16, &
+       CALL MPI_SEND( vsws(nys-1,nxl-1), ngp_xy, MPI_REAL, target_id, 16, &
                       comm_inter, ierr )
-       WRITE ( 9, * )  '    ready'
-       CALL local_flush( 9 )
 
     ELSEIF ( coupling_mode == 'ocean_to_atmosphere' )  THEN
@@ -127 +120 @@
        WRITE ( 9, * )  '*** receive tswst from atmosphere'
        CALL local_flush( 9 )
-       CALL MPI_RECV( tswst(nys-1,nxl-1), ngp_xy, MPI_REAL, myid, 12, &
+       CALL MPI_RECV( tswst(nys-1,nxl-1), ngp_xy, MPI_REAL, target_id, 12, &
                       comm_inter, status, ierr )
-       WRITE ( 9, * )  '    ready'
-       CALL local_flush( 9 )
 
 !
@@ -138 +129 @@
           WRITE ( 9, * )  '*** receive qswst_remote from atmosphere'
           CALL local_flush( 9 )
-          CALL MPI_RECV( qswst_remote(nys-1,nxl-1), ngp_xy, MPI_REAL, myid, &
-               13, comm_inter, status, ierr )
-          WRITE ( 9, * )  '    ready'
-          CALL local_flush( 9 )
+          CALL MPI_RECV( qswst_remote(nys-1,nxl-1), ngp_xy, MPI_REAL, &
+                         target_id, 13, comm_inter, status, ierr )
 
           !here tswst is still the sum of atmospheric bottom heat fluxes
@@ -165 +154 @@
        WRITE ( 9, * )  '*** send pt to atmosphere'
        CALL local_flush( 9 )
-       CALL MPI_SEND( pt(nzt,nys-1,nxl-1), 1, type_xy, myid, 14, comm_inter, &
-                      ierr )
-       WRITE ( 9, * )  '    ready'
-       CALL local_flush( 9 )
+       CALL MPI_SEND( pt(nzt,nys-1,nxl-1), 1, type_xy, target_id, 14, &
+                      comm_inter, ierr )
 
 !
@@ -175 +162 @@
        WRITE ( 9, * )  '*** receive uswst from atmosphere'
        CALL local_flush( 9 )
-       CALL MPI_RECV( uswst(nys-1,nxl-1), ngp_xy, MPI_REAL, myid, 15, &
+       CALL MPI_RECV( uswst(nys-1,nxl-1), ngp_xy, MPI_REAL, target_id, 15, &
                       comm_inter, status, ierr )
-       WRITE ( 9, * )  '    ready'
-       CALL local_flush( 9 )
 
 !
@@ -185 +170 @@
        WRITE ( 9, * )  '*** receive vswst from atmosphere'
        CALL local_flush( 9 )
-       CALL MPI_RECV( vswst(nys-1,nxl-1), ngp_xy, MPI_REAL, myid, 16, &
+       CALL MPI_RECV( vswst(nys-1,nxl-1), ngp_xy, MPI_REAL, target_id, 16, &
                       comm_inter, status, ierr )
-       WRITE ( 9, * )  '    ready'
-       CALL local_flush( 9 )
 
 !