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

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

@@ -2 +2 @@
    !!==============================================================================
    !!                       ***  MODULE  traadv  ***
-   !! Ocean active tracers:  advection trend 
+   !! Ocean active tracers:  advection trend
    !!==============================================================================
    !! History :  2.0  !  2005-11  (G. Madec)  Original code
    !!            3.3  !  2010-09  (C. Ethe, G. Madec)  merge TRC-TRA + switch from velocity to transport
    !!            3.6  !  2011-06  (G. Madec)  Addition of Mixed Layer Eddy parameterisation
-   !!            3.7  !  2014-05  (G. Madec)  Add 2nd/4th order cases for CEN and FCT schemes 
+   !!            3.7  !  2014-05  (G. Madec)  Add 2nd/4th order cases for CEN and FCT schemes
    !!             -   !  2014-12  (G. Madec) suppression of cross land advection option
    !!            3.6  !  2015-06  (E. Clementi) Addition of Stokes drift in case of wave coupling
@@ -34 +34 @@
    USE ldfslp         ! Lateral diffusion: slopes of neutral surfaces
    USE trd_oce        ! trends: ocean variables
-   USE trdtra         ! trends manager: tracers 
-   USE diaptr         ! Poleward heat transport 
+   USE trdtra         ! trends manager: tracers
+   USE diaptr         ! Poleward heat transport
    !
    USE in_out_manager ! I/O manager
@@ -195 +195 @@
          CASE ( np_MUS )                                 ! MUSCL
             ! NOTE: [tiling-comms-merge] I added this lbc_lnk as it did not validate against the trunk when using ln_zco
-            IF (nn_hls.EQ.2) THEN 
+            IF (nn_hls.EQ.2) THEN
                 CALL lbc_lnk( 'traadv', pts(:,:,:,:,Kbb), 'T', 1.)
 #if defined key_loop_fusion
-                CALL tra_adv_mus_lf ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, ln_mus_ups ) 
+                CALL tra_adv_mus_lf ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, ln_mus_ups )
 #else
-                CALL tra_adv_mus    ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, ln_mus_ups ) 
+                CALL tra_adv_mus    ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, ln_mus_ups )
 #endif
             ELSE
-                CALL tra_adv_mus    ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, ln_mus_ups ) 
+                CALL tra_adv_mus    ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, ln_mus_ups )
             END IF
          CASE ( np_UBS )                                 ! UBS
@@ -248 +248 @@
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE tra_adv_init  ***
-      !!                
-      !! ** Purpose :   Control the consistency between namelist options for 
+      !!
+      !! ** Purpose :   Control the consistency between namelist options for
       !!              tracer advection schemes and set nadv
       !!----------------------------------------------------------------------
@@ -290 +290 @@
       !
       !                                !==  Parameter control & set nadv ==!
-      ioptio = 0                       
+      ioptio = 0
       IF( ln_traadv_OFF ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_NO_adv   ;   ENDIF
       IF( ln_traadv_cen ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_CEN      ;   ENDIF
@@ -319 +319 @@
       ENDIF
       !
-      !                                !==  Print the choice  ==!  
+      !                                !==  Print the choice  ==!
       IF(lwp) THEN
          WRITE(numout,*)