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

Timestamp:

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

Author:

laurent

Message:

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

File:

• NEMO/trunk/src/OCE/TRA/traldf_triad.F90 (modified) (5 diffs)

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

@@ -145 +145 @@
       ELSE                    ;   zsign = -1._wp
       ENDIF
-      !    
+      !
       !!----------------------------------------------------------------------
       !!   0 - calculate  ah_wslp2, akz, and optionally zpsi_uw, zpsi_vw
@@ -175 +175 @@
          END DO
          !
-         DO jp = 0, 1                            ! j-k triads 
+         DO jp = 0, 1                            ! j-k triads
             DO kp = 0, 1
                DO_3D( 0, 0, 0, 0, 1, jpkm1 )
@@ -264 +264 @@
             IF( ln_isfcav ) THEN                   ! top level (ocean cavities only)
                DO_2D( 1, 0, 1, 0 )
-                  IF( miku(ji,jj)  > 1 )   zdit(ji,jj,miku(ji,jj) ) = pgui(ji,jj,jn) 
-                  IF( mikv(ji,jj)  > 1 )   zdjt(ji,jj,mikv(ji,jj) ) = pgvi(ji,jj,jn) 
+                  IF( miku(ji,jj)  > 1 )   zdit(ji,jj,miku(ji,jj) ) = pgui(ji,jj,jn)
+                  IF( mikv(ji,jj)  > 1 )   zdjt(ji,jj,mikv(ji,jj) ) = pgvi(ji,jj,jn)
                END_2D
             ENDIF
@@ -392 +392 @@
                   &                            * (  pt(ji,jj,jk-1,jn) - pt(ji,jj,jk,jn) )
             END_3D
-         ELSE                                   ! bilaplacian 
+         ELSE                                   ! bilaplacian
             SELECT CASE( kpass )
             CASE(  1  )                            ! 1st pass : eddy coef = ah_wslp2
@@ -405 +405 @@
                      &                               + akz     (ji,jj,jk) * ( pt2(ji,jj,jk-1,jn) - pt2(ji,jj,jk,jn) )   )
                END_3D
-            END SELECT 
+            END SELECT
          ENDIF
          !