Changeset 7468 for branches/2016

Timestamp:

2016-12-07T10:53:03+01:00 (7 years ago)

Author:

cetlod

Message:

dev_merge_2016: Control the removal of runoff dilution effect only in linerar free surface case

File:

• branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (modified) (2 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/trcbc.F90

@@ -190 +190 @@
          WRITE(numout,*) ' '
          WRITE(numout,'(a,i3)') '   Total tracers to be initialized with COASTAL BCs data:', nb_trccbc
-         IF ( nb_trccbc > 0 ) THEN
+         IF( nb_trccbc > 0 ) THEN
             WRITE(numout,*) '   #trc        NAME        Boundary     Mult.Fact. '
             DO jn = 1, ntrc
@@ -197 +197 @@
          ENDIF
          WRITE(numout,'(2a)') '   COASTAL BC data repository : ', TRIM(cn_dir_cbc)
-         IF ( .NOT. ln_rnf ) ln_rnf_ctl = .FALSE.
-         IF ( ln_rnf_ctl )  WRITE(numout,'(a)') ' -> Remove runoff dilution effect on tracers with absent river load (ln_rnf_ctl = .TRUE.)' 
+         IF( .NOT.ln_rnf .OR. .NOT.ln_linssh ) ln_rnf_ctl = .FALSE.
+         IF( ln_rnf_ctl )  WRITE(numout,'(a)') ' -> Remove runoff dilution effect on tracers with absent river load (ln_rnf_ctl = .TRUE.)' 
          WRITE(numout,*) ' '
          WRITE(numout,'(a,i3)') '   Total tracers to be initialized with OPEN BCs data:', nb_trcobc
 
-         IF ( ln_bdy .AND. nb_trcobc > 0 ) THEN
+         IF( ln_bdy .AND. nb_trcobc > 0 ) THEN
             WRITE(numout,*) '   #trc        NAME        Boundary     Mult.Fact.   OBC Settings'
             DO jn = 1, ntrc
-               IF ( ln_trc_obc(jn) )  WRITE(numout, 9001) jn, TRIM( sn_trcobc(jn)%clvar ), 'OBC', rn_trofac(jn), (trcdta_bdy(jn,ib)%cn_obc,ib=1,nb_bdy)
-               IF ( .NOT. ln_trc_obc(jn) )  WRITE(numout, 9002) jn, 'Set data to IC and use default condition', (trcdta_bdy(jn,ib)%cn_obc,ib=1,nb_bdy)
+               IF( ln_trc_obc(jn) )  WRITE(numout, 9001) jn, TRIM( sn_trcobc(jn)%clvar ), 'OBC', rn_trofac(jn), (trcdta_bdy(jn,ib)%cn_obc,ib=1,nb_bdy)
+               IF( .NOT. ln_trc_obc(jn) )  WRITE(numout, 9002) jn, 'Set data to IC and use default condition', (trcdta_bdy(jn,ib)%cn_obc,ib=1,nb_bdy)
             ENDDO
             WRITE(numout,*) ' '
             DO ib = 1, nb_bdy
-                IF (nn_trcdmp_bdy(ib) .EQ. 0) WRITE(numout,9003) '   Boundary ',ib,' -> NO damping of tracers'
-                IF (nn_trcdmp_bdy(ib) .EQ. 1) WRITE(numout,9003) '   Boundary ',ib,' -> damping ONLY for tracers with external data provided'
-                IF (nn_trcdmp_bdy(ib) .EQ. 2) WRITE(numout,9003) '   Boundary ',ib,' -> damping of ALL tracers'
-                IF (nn_trcdmp_bdy(ib) .GT. 0) THEN
+                IF(nn_trcdmp_bdy(ib) .EQ. 0) WRITE(numout,9003) '   Boundary ',ib,' -> NO damping of tracers'
+                IF(nn_trcdmp_bdy(ib) .EQ. 1) WRITE(numout,9003) '   Boundary ',ib,' -> damping ONLY for tracers with external data provided'
+                IF(nn_trcdmp_bdy(ib) .EQ. 2) WRITE(numout,9003) '   Boundary ',ib,' -> damping of ALL tracers'
+                IF(nn_trcdmp_bdy(ib) .GT. 0) THEN
                    WRITE(numout,9003) '     USE damping parameters from nambdy for boundary ', ib,' : '
                    WRITE(numout,'(a,f10.2,a)') '     - Inflow damping time scale  : ',rn_time_dmp(ib),' days'