Changeset 14072 for NEMO/trunk/src/OCE/TRD

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/TRD/trdini.F90 (modified) (6 diffs)

NEMO/trunk/src/OCE/TRD/trdini.F90

@@ -17 +17 @@
    USE trdglo         ! trends: global domain averaged tracers and dynamics
    USE trdmxl         ! trends: mixed layer averaged trends (tracer only)
-   USE trdvor         ! trends: vertical averaged vorticity 
+   USE trdvor         ! trends: vertical averaged vorticity
    USE in_out_manager ! I/O manager
    USE lib_mpp        ! MPP library
@@ -36 +36 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE trd_init  ***
-      !! 
+      !!
       !! ** Purpose :   Initialization of trend diagnostics
       !!----------------------------------------------------------------------
@@ -43 +43 @@
       !!
       NAMELIST/namtrd/ ln_dyn_trd, ln_KE_trd, ln_vor_trd, ln_dyn_mxl,   &
-         &             ln_tra_trd, ln_PE_trd, ln_glo_trd, ln_tra_mxl, nn_trd 
+         &             ln_tra_trd, ln_PE_trd, ln_glo_trd, ln_tra_mxl, nn_trd
       !!----------------------------------------------------------------------
       !
@@ -70 +70 @@
       ENDIF
       !
-      !                             ! trend extraction flags  
-      l_trdtra = .FALSE.                                                       ! tracers  
+      !                             ! trend extraction flags
+      l_trdtra = .FALSE.                                                       ! tracers
       IF ( ln_tra_trd .OR. ln_PE_trd .OR. ln_tra_mxl .OR.   &
-         & ln_glo_trd                                       )   l_trdtra = .TRUE. 
+         & ln_glo_trd                                       )   l_trdtra = .TRUE.
       !
       l_trddyn = .FALSE.                                                       ! momentum
@@ -80 +80 @@
       !
 
-!!gm check the stop below      
+!!gm check the stop below
       IF( ln_dyn_mxl )   CALL ctl_stop( 'ML diag on momentum are not yet coded we stop' )
       !
@@ -97 +97 @@
 
 !!gm  : Potential BUG : 3D output only for vector invariant form!  add a ctl_stop or code the flux form case
-!!gm  : bug/pb for vertical advection of tracer in vvl case: add T.dt[eta] in the output... 
+!!gm  : bug/pb for vertical advection of tracer in vvl case: add T.dt[eta] in the output...
 
-      !                             ! diagnostic initialization  
+      !                             ! diagnostic initialization
       IF( ln_glo_trd )   CALL trd_glo_init( Kmm )      ! global domain averaged trends
-      IF( ln_tra_mxl )   CALL trd_mxl_init      ! mixed-layer          trends  
+      IF( ln_tra_mxl )   CALL trd_mxl_init      ! mixed-layer          trends
       IF( ln_vor_trd )   CALL trd_vor_init      ! barotropic vorticity trends
       IF( ln_KE_trd  )   CALL trd_ken_init      ! 3D Kinetic    energy trends