Changeset 12110 for NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/TOP/trcbc.F90

Timestamp:

2019-12-07T12:44:31+01:00 (4 years ago)

Author:

cetlod

Message:

merge dev_r11219_TOP-01_cethe_PISCES_LBC onto dev_r12072_TOP-01_ENHANCE-11_CEthe

File:

• NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/TOP/trcbc.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r12072_TOP-01_ENHANCE-11_CEthe/src/TOP/trcbc.F90

@@ -81 +81 @@
       !!
       NAMELIST/namtrc_bc/ cn_dir_obc, sn_trcobc, rn_trofac, cn_dir_sbc, sn_trcsbc, rn_trsfac, & 
-                        & cn_dir_cbc, sn_trccbc, rn_trcfac, ln_rnf_ctl, rn_bc_time
+                        & cn_dir_cbc, sn_trccbc, rn_trcfac, ln_rnf_ctl, rn_sbc_time, rn_cbc_time
       NAMELIST/namtrc_bdy/ cn_trc_dflt, cn_trc, nn_trcdmp_bdy
       !!----------------------------------------------------------------------
@@ -429 +429 @@
          IF( ln_trc_sbc(jn) ) THEN
             jl = n_trc_indsbc(jn)
+            sf_trcsbc(jl)%fnow(:,:,1) = MAX( rtrn, sf_trcsbc(jl)%fnow(:,:,1) ) ! avoid nedgative value due to interpolation
             DO jj = 2, jpj
                DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zfact = 1. / ( e3t_n(ji,jj,1) * rn_bc_time )
+                  zfact = 1. / ( e3t_n(ji,jj,1) * rn_sbc_time )
                   tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + rf_trsfac(jl) * sf_trcsbc(jl)%fnow(ji,jj,1) * zfact
                END DO
@@ -438 +439 @@
          !
          ! COASTAL boundary conditions
-         IF( ln_rnf .AND. ln_trc_cbc(jn) ) THEN
+         IF( ( ln_rnf .OR. l_offline ) .AND. ln_trc_cbc(jn) ) THEN
+            IF( l_offline )   rn_rfact = 1._wp
             jl = n_trc_indcbc(jn)
             DO jj = 2, jpj
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   DO jk = 1, nk_rnf(ji,jj)
-                     zfact = rn_rfact / ( e1e2t(ji,jj) * h_rnf(ji,jj) * rn_bc_time ) 
+                     zfact = rn_rfact / ( e1e2t(ji,jj) * h_rnf(ji,jj) * rn_cbc_time ) * tmask(ji,jj,1)
                      tra(ji,jj,jk,jn) = tra(ji,jj,jk,jn) + rf_trcfac(jl) * sf_trccbc(jl)%fnow(ji,jj,1) * zfact
                   END DO