Changeset 14072 for NEMO/trunk/src/OCE/TRA/traadv_cen.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/traadv_cen.F90 (modified) (7 diffs)

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

@@ -13 +13 @@
    USE dom_oce        ! ocean space and time domain
    USE eosbn2         ! equation of state
-   USE traadv_fct     ! acces to routine interp_4th_cpt 
+   USE traadv_fct     ! acces to routine interp_4th_cpt
    USE trd_oce        ! trends: ocean variables
-   USE trdtra         ! trends manager: tracers 
+   USE trdtra         ! trends manager: tracers
    USE diaptr         ! poleward transport diagnostics
    USE diaar5         ! AR5 diagnostics
@@ -28 +28 @@
 
    PUBLIC   tra_adv_cen   ! called by traadv.F90
-   
+
    REAL(wp) ::   r1_6 = 1._wp / 6._wp   ! =1/6
 
@@ -46 +46 @@
 
    SUBROUTINE tra_adv_cen( kt, kit000, cdtype, pU, pV, pW,     &
-      &                    Kmm, pt, kjpt, Krhs, kn_cen_h, kn_cen_v ) 
+      &                    Kmm, pt, kjpt, Krhs, kn_cen_h, kn_cen_v )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_adv_cen  ***
-      !!                 
+      !!
       !! ** Purpose :   Compute the now trend due to the advection of tracers
       !!      and add it to the general trend of passive tracer equations.
       !!
       !! ** Method  :   The advection is evaluated by a 2nd or 4th order scheme
-      !!               using now fields (leap-frog scheme). 
+      !!               using now fields (leap-frog scheme).
       !!       kn_cen_h = 2  ==>> 2nd order centered scheme on the horizontal
       !!                = 4  ==>> 4th order    -        -       -      -
@@ -98 +98 @@
       ENDIF
       !
-      !                    
+      !
       zwz(:,:, 1 ) = 0._wp       ! surface & bottom vertical flux set to zero for all tracers
       zwz(:,:,jpk) = 0._wp
@@ -155 +155 @@
             IF( ln_isfcav ) THEN                  ! ice-shelf cavities (top of the ocean)
                DO_2D( 1, 1, 1, 1 )
-                  zwz(ji,jj, mikt(ji,jj) ) = pW(ji,jj,mikt(ji,jj)) * pt(ji,jj,mikt(ji,jj),jn,Kmm) 
+                  zwz(ji,jj, mikt(ji,jj) ) = pW(ji,jj,mikt(ji,jj)) * pt(ji,jj,mikt(ji,jj),jn,Kmm)
                END_2D
             ELSE                                   ! no ice-shelf cavities (only ocean surface)
@@ -163 +163 @@
             ENDIF
          ENDIF
-         !               
+         !
          DO_3D( 0, 0, 0, 0, 1, jpkm1 )   !--  Divergence of advective fluxes  --!
             pt(ji,jj,jk,jn,Krhs) = pt(ji,jj,jk,jn,Krhs)    &
@@ -185 +185 @@
       !
    END SUBROUTINE tra_adv_cen
-   
+
    !!======================================================================
 END MODULE traadv_cen