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

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

@@ -9 +9 @@
    !!            3.3  !  2010-04  (M. Leclair, G. Madec)  Forcing averaged over 2 time steps
    !!             -   !  2010-09  (C. Ethe, G. Madec) Merge TRA-TRC
-   !!            3.6  !  2014-11  (P. Mathiot) isf melting forcing 
+   !!            3.6  !  2014-11  (P. Mathiot) isf melting forcing
    !!            4.1  !  2019-09  (P. Mathiot) isf moved in traisf
    !!----------------------------------------------------------------------
@@ -21 +21 @@
    USE phycst         ! physical constant
    USE eosbn2         ! Equation Of State
-   USE sbcmod         ! ln_rnf  
-   USE sbcrnf         ! River runoff  
+   USE sbcmod         ! ln_rnf
+   USE sbcrnf         ! River runoff
    USE traqsr         ! solar radiation penetration
    USE trd_oce        ! trends: ocean variables
-   USE trdtra         ! trends manager: tracers 
-#if defined key_asminc   
+   USE trdtra         ! trends manager: tracers
+#if defined key_asminc
    USE asminc         ! Assimilation increment
 #endif
@@ -54 +54 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_sbc  ***
-      !!                   
+      !!
       !! ** Purpose :   Compute the tracer surface boundary condition trend of
       !!      (flux through the interface, concentration/dilution effect)
       !!      and add it to the general trend of tracer equations.
       !!
-      !! ** Method :   The (air+ice)-sea flux has two components: 
-      !!      (1) Fext, external forcing (i.e. flux through the (air+ice)-sea interface); 
-      !!      (2) Fwe , tracer carried with the water that is exchanged with air+ice. 
+      !! ** Method :   The (air+ice)-sea flux has two components:
+      !!      (1) Fext, external forcing (i.e. flux through the (air+ice)-sea interface);
+      !!      (2) Fwe , tracer carried with the water that is exchanged with air+ice.
       !!               The input forcing fields (emp, rnf, sfx) contain Fext+Fwe,
       !!             they are simply added to the tracer trend (ts(Krhs)).
@@ -69 +69 @@
       !!             concentration/dilution effect associated with water exchanges.
       !!
-      !! ** Action  : - Update ts(Krhs) with the surface boundary condition trend 
+      !! ** Action  : - Update ts(Krhs) with the surface boundary condition trend
       !!              - send trends to trdtra module for further diagnostics(l_trdtra=T)
       !!----------------------------------------------------------------------
@@ -143 +143 @@
          sbc_tsc(ji,jj,jp_sal) = r1_rho0     * sfx(ji,jj)   ! salt flux due to freezing/melting
       END_2D
-      IF( ln_linssh ) THEN                !* linear free surface  
+      IF( ln_linssh ) THEN                !* linear free surface
          DO_2D( isj, iej, isi, iei )                    !==>> add concentration/dilution effect due to constant volume cell
             sbc_tsc(ji,jj,jp_tem) = sbc_tsc(ji,jj,jp_tem) + r1_rho0 * emp(ji,jj) * pts(ji,jj,1,jp_tem,Kmm)
@@ -161 +161 @@
          END_2D
       END DO
-      !                  
+      !
       IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only on the last tile
          IF( lrst_oce ) THEN           !==  write sbc_tsc in the ocean restart file  ==!
@@ -173 +173 @@
       !----------------------------------------
       !
-      IF( ln_rnf ) THEN         ! input of heat and salt due to river runoff 
+      IF( ln_rnf ) THEN         ! input of heat and salt due to river runoff
          zfact = 0.5_wp
          DO_2D( 0, 0, 0, 0 )
@@ -182 +182 @@
                                         &                      +  ( rnf_tsc_b(ji,jj,jp_tem) + rnf_tsc(ji,jj,jp_tem) ) * zdep
                   IF( ln_rnf_sal )   pts(ji,jj,jk,jp_sal,Krhs) = pts(ji,jj,jk,jp_sal,Krhs)                                  &
-                                        &                      +  ( rnf_tsc_b(ji,jj,jp_sal) + rnf_tsc(ji,jj,jp_sal) ) * zdep 
+                                        &                      +  ( rnf_tsc_b(ji,jj,jp_sal) + rnf_tsc(ji,jj,jp_sal) ) * zdep
                END DO
             ENDIF
@@ -201 +201 @@
       IF( ln_sshinc ) THEN         ! input of heat and salt due to assimilation
           !
-         IF( ln_linssh ) THEN 
+         IF( ln_linssh ) THEN
             DO_2D( 0, 0, 0, 0 )
                ztim = ssh_iau(ji,jj) / e3t(ji,jj,1,Kmm)