Changeset 14327

Timestamp:

2021-01-22T11:50:04+01:00 (3 years ago)

Author:

smasson

Message:

dev_r14312_MPI_Interface: bugfix for icebergs and NP folding, #2598

Location:

NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE

Files:

• ICB/icbini.F90 (modified) (2 diffs)
• ICB/icblbc.F90 (modified) (9 diffs)
• LBC/mpp_lnk_icb_generic.h90 (modified) (2 diffs)
• LBC/mppini.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE/ICB/icbini.F90

@@ -189 +189 @@
       
       ! north fold
-      IF( l_NFoldT .OR.  l_NFoldF ) THEN
+      IF( l_IdoNFold ) THEN
          !
          ! icebergs in row nicbej+1 get passed across fold
@@ -235 +235 @@
          WRITE(numicb,*) "j point"
          WRITE(numicb,*) (INT(src_calving(ji,jj)), jj=1,jpj)
-         IF( l_NFoldT .OR. l_NFoldF ) THEN
+         IF( l_IdoNFold ) THEN
             WRITE(numicb,*) 'north fold destination points '
             WRITE(numicb,*) nicbfldpts

NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE/ICB/icblbc.F90

@@ -105 +105 @@
       IF( l_Jperio)      CALL ctl_stop(' north-south periodicity not implemented for icebergs')
       ! north fold
-      IF( l_NFoldT .OR. l_NFoldF )   CALL icb_lbc_nfld()
+      IF( l_IdoNFold )   CALL icb_lbc_nfld()
       !
    END SUBROUTINE icb_lbc
@@ -185 +185 @@
       !
       ! at northern line of processors with north fold handle bergs differently
-      IF( l_NFoldT .OR. l_NFoldF )   ipe_N = -1
+      IF( l_IdoNFold )   ipe_N = -1
 
       ! if there's only one processor in x direction then don't let mpp try to handle periodicity
@@ -285 +285 @@
       ENDIF
       
-      IF( ibergs_to_send_w > 0 ) CALL mppsend( 13, obuffer_w%DATA, ibergs_to_send_w*jp_buffer_width, ipe_W, iml_req2 )
-      IF( ibergs_to_send_e > 0 ) CALL mppsend( 14, obuffer_e%DATA, ibergs_to_send_e*jp_buffer_width, ipe_E, iml_req3 )
+      IF( ibergs_to_send_w > 0 ) CALL mppsend( 13, obuffer_w%data, ibergs_to_send_w*jp_buffer_width, ipe_W, iml_req2 )
+      IF( ibergs_to_send_e > 0 ) CALL mppsend( 14, obuffer_e%data, ibergs_to_send_e*jp_buffer_width, ipe_E, iml_req3 )
       IF( ibergs_rcvd_from_e > 0 ) THEN
          CALL icb_increase_ibuffer(ibuffer_e, ibergs_rcvd_from_e)
-         CALL mpprecv( 13, ibuffer_e%DATA, ibergs_rcvd_from_e*jp_buffer_width )
+         CALL mpprecv( 13, ibuffer_e%data, ibergs_rcvd_from_e*jp_buffer_width )
       ENDIF
       IF( ibergs_rcvd_from_w > 0 ) THEN
          CALL icb_increase_ibuffer(ibuffer_w, ibergs_rcvd_from_w)
-         CALL mpprecv( 14, ibuffer_w%DATA, ibergs_rcvd_from_w*jp_buffer_width )
+         CALL mpprecv( 14, ibuffer_w%data, ibergs_rcvd_from_w*jp_buffer_width )
       ENDIF
       IF( ibergs_to_send_w > 0 ) CALL mpi_wait( iml_req2, iml_stat, iml_err )
@@ -299 +299 @@
       DO i = 1, ibergs_rcvd_from_e
          IF( nn_verbose_level >= 4 ) THEN
-            WRITE(numicb,*) 'bergstep ',nktberg,' unpacking berg ',INT(ibuffer_e%DATA(16,i)),' from east'
+            WRITE(numicb,*) 'bergstep ',nktberg,' unpacking berg ',INT(ibuffer_e%data(16,i)),' from east'
             CALL FLUSH( numicb )
          ENDIF
@@ -306 +306 @@
       DO i = 1, ibergs_rcvd_from_w
          IF( nn_verbose_level >= 4 ) THEN
-            WRITE(numicb,*) 'bergstep ',nktberg,' unpacking berg ',INT(ibuffer_w%DATA(16,i)),' from west'
+            WRITE(numicb,*) 'bergstep ',nktberg,' unpacking berg ',INT(ibuffer_w%data(16,i)),' from west'
             CALL FLUSH( numicb )
          ENDIF
          CALL icb_unpack_from_buffer(first_berg, ibuffer_w, i)
-      ENDDO
+      END DO
 
       ! Find number of bergs that headed north/south
@@ -370 +370 @@
       ENDIF
 
-      IF( ibergs_to_send_s > 0 ) CALL mppsend( 17, obuffer_s%DATA, ibergs_to_send_s*jp_buffer_width, ipe_S, iml_req2 )
-      IF( ibergs_to_send_n > 0 ) CALL mppsend( 18, obuffer_n%DATA, ibergs_to_send_n*jp_buffer_width, ipe_N, iml_req3 )
+      IF( ibergs_to_send_s > 0 ) CALL mppsend( 17, obuffer_s%data, ibergs_to_send_s*jp_buffer_width, ipe_S, iml_req2 )
+      IF( ibergs_to_send_n > 0 ) CALL mppsend( 18, obuffer_n%data, ibergs_to_send_n*jp_buffer_width, ipe_N, iml_req3 )
       IF( ibergs_rcvd_from_n > 0 ) THEN
          CALL icb_increase_ibuffer(ibuffer_n, ibergs_rcvd_from_n)
-         CALL mpprecv( 17, ibuffer_n%DATA, ibergs_rcvd_from_n*jp_buffer_width )
+         CALL mpprecv( 17, ibuffer_n%data, ibergs_rcvd_from_n*jp_buffer_width )
       ENDIF
       IF( ibergs_rcvd_from_s > 0 ) THEN
          CALL icb_increase_ibuffer(ibuffer_s, ibergs_rcvd_from_s)
-         CALL mpprecv( 18, ibuffer_s%DATA, ibergs_rcvd_from_s*jp_buffer_width )
+         CALL mpprecv( 18, ibuffer_s%data, ibergs_rcvd_from_s*jp_buffer_width )
       ENDIF
       IF( ibergs_to_send_s > 0 ) CALL mpi_wait( iml_req2, iml_stat, iml_err )
@@ -384 +384 @@
       DO i = 1, ibergs_rcvd_from_n
          IF( nn_verbose_level >= 4 ) THEN
-            WRITE(numicb,*) 'bergstep ',nktberg,' unpacking berg ',INT(ibuffer_n%DATA(16,i)),' from north'
+            WRITE(numicb,*) 'bergstep ',nktberg,' unpacking berg ',INT(ibuffer_n%data(16,i)),' from north'
             CALL FLUSH( numicb )
          ENDIF
@@ -391 +391 @@
       DO i = 1, ibergs_rcvd_from_s
          IF( nn_verbose_level >= 4 ) THEN
-            WRITE(numicb,*) 'bergstep ',nktberg,' unpacking berg ',INT(ibuffer_s%DATA(16,i)),' from south'
+            WRITE(numicb,*) 'bergstep ',nktberg,' unpacking berg ',INT(ibuffer_s%data(16,i)),' from south'
             CALL FLUSH( numicb )
          ENDIF
          CALL icb_unpack_from_buffer(first_berg, ibuffer_s, i)
-      ENDDO
+      END DO
       
       IF( nn_verbose_level > 0 ) THEN
@@ -435 +435 @@
       ! deal with north fold if we necessary when there is more than one top row processor
       ! note that for jpni=1 north fold has been dealt with above in call to icb_lbc
-      IF( ( l_NFoldT .OR. l_NFoldF ) .AND. jpni > 1 ) CALL icb_lbc_mpp_nfld( )
+      IF( l_IdoNFold .AND. jpni > 1 ) CALL icb_lbc_mpp_nfld( )
 
       IF( nn_verbose_level > 0 ) THEN

NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE/LBC/mpp_lnk_icb_generic.h90

@@ -85 +85 @@
       ! north fold treatment
       ! -----------------------
-      IF( l_NFoldT .OR. l_NFoldF ) THEN
+      IF( l_IdoNFold ) THEN
          !
          SELECT CASE ( jpni )
@@ -158 +158 @@
       IF( mpinei(jpno) >= 0  )   CALL RECVROUTINE( 3, r2dns(1-kexti,1,2), imigr, mpinei(jpno) )
       IF( mpinei(jpso) >= 0  )   CALL mpi_wait(ml_req1,ml_stat,ml_err)
-      IF( mpinei(jpso) >= 0  )   CALL mpi_wait(ml_req2,ml_stat,ml_err)
+      IF( mpinei(jpno) >= 0  )   CALL mpi_wait(ml_req2,ml_stat,ml_err)
       !
       IF( ln_timing ) CALL tic_tac(.FALSE.)

NEMO/branches/2021/dev_r14312_MPI_Interface/src/OCE/LBC/mppini.F90

@@ -494 +494 @@
       !                          ! Prepare mpp north fold
       !
-      llmpiNfold =          jpnj  > 1 .AND. ( l_NFoldT .OR. l_NFoldF )   ! is the North fold done with an MPI communication?
+      llmpiNfold =          jpni  > 1 .AND. ( l_NFoldT .OR. l_NFoldF )   ! is the North fold done with an MPI communication?
       l_IdoNFold = ijn(narea) == jpnj .AND. ( l_NFoldT .OR. l_NFoldF )   ! is this process doing North fold?
       !