Changeset 8985 for branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2017-12-12T10:16:18+01:00 (6 years ago)

Author:

timgraham

Message:

Merged Wetting and drying changes into branch

File:

• branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (1 diff)

branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -317 +317 @@
                   IF( jk == mikt(ji,jj) ) THEN           ! first level 
                      ze3t_f = ze3t_f - zfact2 * ( (emp_b(ji,jj)    - emp(ji,jj)   )  &
-                            &                   - (rnf_b(ji,jj)    - rnf(ji,jj)   )  &
                             &                   + (fwfisf_b(ji,jj) - fwfisf(ji,jj))  )
                      ztc_f  = ztc_f  - zfact1 * ( psbc_tc(ji,jj,jn) - psbc_tc_b(ji,jj,jn) )
                   ENDIF
+                  IF( ln_rnf_depth ) THEN
+                     ! Rivers are not just at the surface must go down to nk_rnf(ji,jj)
+                     IF( mikt(ji,jj) <=jk .and. jk <= nk_rnf(ji,jj)  ) THEN
+                        ze3t_f = ze3t_f - zfact2 * ( - (rnf_b(ji,jj) - rnf(ji,jj)   )  ) &
+                    &                            * ( e3t_n(ji,jj,jk) / h_rnf(ji,jj) ) 
+                     ENDIF
+                  ELSE
+                     IF( jk == mikt(ji,jj) ) THEN           ! first level 
+                        ze3t_f = ze3t_f - zfact2 * ( - (rnf_b(ji,jj)    - rnf(ji,jj)   ) ) 
+                     ENDIF
+                  ENDIF
+
                   !
                   ! solar penetration (temperature only)