Changeset 2207 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2010-10-11T18:51:54+02:00 (14 years ago)

Author:

acc

Message:

#733 DEV_r2191_3partymerge2010. Merged in changes from devukmo2010 branch

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (5 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -21 +21 @@
    USE in_out_manager  ! I/O manager
    USE prtctl          ! Print control
+   USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+   USE sbcrnf          ! River runoff  
+   USE sbcmod          ! ln_rnf  
 
    IMPLICIT NONE
@@ -103 +106 @@
       INTEGER, INTENT(in) ::   kt     ! ocean time-step index
       !!
-      INTEGER  ::   ji, jj                   ! dummy loop indices
-      REAL(wp) ::   zta, zsa, zsrau, zse3t   ! temporary scalars
+      INTEGER  ::   ji, jj, jk           ! dummy loop indices  
+      REAL(wp) ::   zta, zsa             ! local scalars, adjustment to temperature and salinity  
+      REAL(wp) ::   zata, zasa           ! local scalars, calculations of automatic change to temp & sal due to vvl (done elsewhere)  
+      REAL(wp) ::   zsrau, zse3t, zdep   ! local scalars, 1/density, 1/height of box, 1/height of effected water column  
+      REAL(wp) ::   zdheat, zdsalt       ! total change of temperature and salinity  
       !!----------------------------------------------------------------------
 
@@ -125 +131 @@
       IF( .NOT.ln_traqsr )   qsr(:,:) = 0.e0   ! no solar radiation penetration
 
-      ! Concentration dillution effect on (t,s)
+      ! Concentration dilution effect on (t,s) due to evapouration, precipitation and qns, but not river runoff  
       DO jj = 2, jpj
          DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -132 +138 @@
 #endif
             IF( lk_vvl) THEN
-               zta = ro0cpr * qns(ji,jj) * zse3t &                   ! temperature : heat flux
-                &    - emp(ji,jj) * zsrau * tn(ji,jj,1)  * zse3t     ! & cooling/heating effet of EMP flux
+               zta =  ro0cpr * qns(ji,jj) * zse3t &                  ! temperature : heat flux 
+                &    - emp(ji,jj) * zsrau * tn(ji,jj,1) * zse3t      ! & cooling/heating effet of EMP flux 
                zsa = ( emps(ji,jj) - emp(ji,jj) ) &
                 &                 * zsrau * sn(ji,jj,1)  * zse3t     ! concent./dilut. effect due to sea-ice 
                                                                      ! melt/formation and (possibly) SSS restoration
             ELSE
-               zta = ro0cpr * qns(ji,jj) * zse3t     ! temperature : heat flux
-               zsa = emps(ji,jj) * zsrau * sn(ji,jj,1)   * zse3t     ! salinity :  concent./dilut. effect
+               zta =  ro0cpr * qns(ji,jj) * zse3t                    ! temperature : heat flux 
+               zsa =  emps(ji,jj) * zsrau * sn(ji,jj,1) * zse3t      ! salinity :  concent./dilut. effect 
             ENDIF
             ta(ji,jj,1) = ta(ji,jj,1) + zta                          ! add the trend to the general tracer trend
@@ -145 +151 @@
          END DO
       END DO
+
+      !                             !==  Runoffs  ==!
+      ! Effect on (t,s) due to river runoff (dilution effect automatically applied via vertical tracer advection) 
+      IF( ln_rnf ) THEN  
+         DO jj = 2, jpj 
+            DO ji = fs_2, fs_jpim1
+               zdep = 1. / h_rnf(ji,jj)  
+               IF ( rnf(ji,jj) .ne. 0.0 ) THEN
+                  DO jk = 1, nk_rnf(ji,jj)
+                                        ta(ji,jj,jk) = ta(ji,jj,jk) + tsc_rnf(ji,jj,jp_tem) * zdep
+                     IF( ln_rnf_sal )   sa(ji,jj,jk) = sa(ji,jj,jk) + tsc_rnf(ji,jj,jp_sal) * zdep
+                  ENDDO
+               ENDIF
+            ENDDO  
+         ENDDO  
+      ENDIF  
+
+      CALL lbc_lnk( ta, 'T', 1. )    ;    CALL lbc_lnk( sa, 'T', 1. )
 
       IF( l_trdtra ) THEN      ! save the sbc trends for diagnostic