Changeset 8578

Timestamp:

2017-10-02T19:24:20+02:00 (7 years ago)

Author:

clem

Message:

reduce communications

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg_evp.F90 (modified) (7 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rhg_evp.F90

@@ -355 +355 @@
          CALL lbc_lnk( zds, 'F', 1. )
 
-         DO jj = 2, jpjm1
-            DO ji = 2, jpim1 ! no vector loop
+         DO jj = 2, jpj    ! loop to jpi,jpj to avoid making a communication for zs1,zs2,zs12
+            DO ji = 2, jpi ! no vector loop
 
                ! shear**2 at T points (doc eq. A16)
@@ -400 +400 @@
             END DO
          END DO
-         CALL lbc_lnk_multi( zs1, 'T', 1., zs2, 'T', 1., zs12, 'F', 1. )
- 
 
          ! --- Ice internal stresses (Appendix C of Hunke and Dukowicz, 2002) --- !
@@ -651 +649 @@
          END DO
       END DO           
-      CALL lbc_lnk( zds, 'F', 1. )
       
       DO jj = 2, jpjm1
@@ -685 +682 @@
       
       ! --- Store the stress tensor for the next time step --- !
+      CALL lbc_lnk_multi( zs1, 'T', 1., zs2, 'T', 1., zs12, 'F', 1. )
       pstress1_i (:,:) = zs1 (:,:)
       pstress2_i (:,:) = zs2 (:,:)
@@ -700 +698 @@
 
       ! --- divergence, shear and strength --- !
-      IF( iom_use('idive')  )   CALL iom_put( "idive"  , pdivu_i(:,:)   * zswi(:,:) )   ! divergence
-      IF( iom_use('ishear') )   CALL iom_put( "ishear" , pshear_i(:,:)  * zswi(:,:) )   ! shear
+      IF( iom_use('idive')  )   CALL iom_put( "idive"  , pdivu_i(:,:)  * zswi(:,:) )   ! divergence
+      IF( iom_use('ishear') )   CALL iom_put( "ishear" , pshear_i(:,:) * zswi(:,:) )   ! shear
       IF( iom_use('icestr') )   CALL iom_put( "icestr" , strength(:,:) * zswi(:,:) )   ! Ice strength
 
@@ -724 +722 @@
 !!                                                                                                               ! (scheme converges if this value is ~1, see Bouillon et al 2009 (eq. 11))
                zsig1(ji,jj) = 0.5_wp * zdum2 * ( pstress1_i(ji,jj) )          ! compressive stress, see Bouillon et al. 2015
-               zsig2(ji,jj) = 0.5_wp * zdum2 * ( zshear )                    ! shear stress
+               zsig2(ji,jj) = 0.5_wp * zdum2 * ( zshear )                     ! shear stress
                zsig3(ji,jj) = zdum2**2 * ( ( pstress1_i(ji,jj) + strength(ji,jj) )**2 + ( rn_ecc * zshear )**2 )
             END DO
@@ -757 +755 @@
                
                ! Stress terms of the momentum equation (N/m2)
-               zdiag_dssh_dx(ji,jj) = zspgU(ji,jj) * rswitch    ! sea surface slope stress term
+               zdiag_dssh_dx(ji,jj) = zspgU(ji,jj) * rswitch     ! sea surface slope stress term
                zdiag_dssh_dy(ji,jj) = zspgV(ji,jj) * rswitch
                
-               zdiag_corstrx(ji,jj) = zCorx(ji,jj) * rswitch    ! Coriolis stress term
+               zdiag_corstrx(ji,jj) = zCorx(ji,jj) * rswitch     ! Coriolis stress term
                zdiag_corstry(ji,jj) = zCory(ji,jj) * rswitch
                
-               zdiag_intstrx(ji,jj) = zfU(ji,jj)   * rswitch    ! internal stress term
+               zdiag_intstrx(ji,jj) = zfU(ji,jj)   * rswitch     ! internal stress term
                zdiag_intstry(ji,jj) = zfV(ji,jj)   * rswitch