Changeset 14072 for NEMO/trunk/src/OCE/TRA/traldf_lap_blp.F90

Timestamp:

2020-12-04T08:48:38+01:00 (4 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/OCE/TRA/traldf_lap_blp.F90 (modified) (8 diffs)

NEMO/trunk/src/OCE/TRA/traldf_lap_blp.F90

@@ -4 +4 @@
    !! Ocean tracers:  lateral diffusivity trend  (laplacian and bilaplacian)
    !!==============================================================================
-   !! History :  3.7  ! 2014-01  (G. Madec, S. Masson)  Original code, re-entrant laplacian 
+   !! History :  3.7  ! 2014-01  (G. Madec, S. Masson)  Original code, re-entrant laplacian
    !!----------------------------------------------------------------------
 
@@ -74 +74 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_ldf_lap  ***
-      !!                   
-      !! ** Purpose :   Compute the before horizontal tracer (t & s) diffusive 
+      !!
+      !! ** Purpose :   Compute the before horizontal tracer (t & s) diffusive
       !!      trend and add it to the general trend of tracer equation.
       !!
       !! ** Method  :   Second order diffusive operator evaluated using before
-      !!      fields (forward time scheme). The horizontal diffusive trends of 
+      !!      fields (forward time scheme). The horizontal diffusive trends of
       !!      the tracer is given by:
       !!          difft = 1/(e1e2t*e3t) {  di-1[ pahu e2u*e3u/e1u di(tb) ]
@@ -86 +86 @@
       !!          pt_rhs = pt_rhs + difft
       !!
-      !! ** Action  : - Update pt_rhs arrays with the before iso-level 
+      !! ** Action  : - Update pt_rhs arrays with the before iso-level
       !!                harmonic mixing trend.
       !!----------------------------------------------------------------------
@@ -139 +139 @@
       !                             ! =========== !
       DO jn = 1, kjpt               ! tracer loop !
-         !                          ! =========== !    
-         !                               
+         !                          ! =========== !
+         !
          DO_3D( nn_hls, nn_hls-1, nn_hls, nn_hls-1, 1, jpkm1 )            !== First derivative (gradient)  ==!
             ztu(ji,jj,jk) = zaheeu(ji,jj,jk) * ( pt(ji+1,jj  ,jk,jn) - pt(ji,jj,jk,jn) )
@@ -152 +152 @@
             IF( ln_isfcav ) THEN                             ! top in ocean cavities only
                DO_2D( nn_hls, nn_hls-1, nn_hls, nn_hls-1 )
-                  IF( miku(ji,jj) > 1 )   ztu(ji,jj,miku(ji,jj)) = zaheeu(ji,jj,miku(ji,jj)) * pgui(ji,jj,jn) 
-                  IF( mikv(ji,jj) > 1 )   ztv(ji,jj,mikv(ji,jj)) = zaheev(ji,jj,mikv(ji,jj)) * pgvi(ji,jj,jn) 
+                  IF( miku(ji,jj) > 1 )   ztu(ji,jj,miku(ji,jj)) = zaheeu(ji,jj,miku(ji,jj)) * pgui(ji,jj,jn)
+                  IF( mikv(ji,jj) > 1 )   ztv(ji,jj,mikv(ji,jj)) = zaheev(ji,jj,mikv(ji,jj)) * pgvi(ji,jj,jn)
                END_2D
             ENDIF
@@ -177 +177 @@
       !
    END SUBROUTINE tra_ldf_lap_t
-   
+
 
    SUBROUTINE tra_ldf_blp( kt, Kmm, kit000, cdtype, pahu, pahv  ,             &
@@ -184 +184 @@
       !!----------------------------------------------------------------------
       !!                 ***  ROUTINE tra_ldf_blp  ***
-      !!                    
-      !! ** Purpose :   Compute the before lateral tracer diffusive 
+      !!
+      !! ** Purpose :   Compute the before lateral tracer diffusive
       !!      trend and add it to the general trend of tracer equation.
       !!
@@ -238 +238 @@
       ! NOTE: [tiling-comms-merge] Needed for both nn_hls as tra_ldf_iso and tra_ldf_triad have not yet been adjusted to work with nn_hls = 2. In the zps case the lbc_lnk in zps_hde handles this, but in the zco case zlap always needs this lbc_lnk. I did try adjusting the bounds in tra_ldf_iso and tra_ldf_triad so this lbc_lnk was only needed for nn_hls = 1, but this was not correct and I did not have time to figure out why
       CALL lbc_lnk( 'traldf_lap_blp', zlap(:,:,:,:) , 'T', 1.0_wp )     ! Lateral boundary conditions (unchanged sign)
-      !                                               ! Partial top/bottom cell: GRADh( zlap )  
+      !                                               ! Partial top/bottom cell: GRADh( zlap )
       IF( ln_isfcav .AND. ln_zps ) THEN   ;   CALL zps_hde_isf( kt, Kmm, kjpt, zlap, zglu, zglv, zgui, zgvi )  ! both top & bottom
-      ELSEIF(             ln_zps ) THEN   ;   CALL zps_hde    ( kt, Kmm, kjpt, zlap, zglu, zglv )              ! only bottom 
+      ELSEIF(             ln_zps ) THEN   ;   CALL zps_hde    ( kt, Kmm, kjpt, zlap, zglu, zglv )              ! only bottom
       ENDIF
       !