Changeset 2052 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcsbc.F90

Timestamp:

2010-08-13T11:15:17+02:00 (14 years ago)

Author:

cetlod

Message:

Improve the merge TRA-TRC, see ticket:701

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) (4 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcsbc.F90

@@ -66 +66 @@
       INTEGER  ::   ji, jj, jn           ! dummy loop indices
       REAL(wp) ::   ztra, zsrau, zse3t   ! temporary scalars
+      REAL(wp), DIMENSION(jpi,jpj) ::   zemps  ! surface freshwater flux
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   ztrtrd
       CHARACTER (len=22) :: charout
@@ -76 +77 @@
       ENDIF
 
+
       IF( l_trdtrc ) ALLOCATE( ztrtrd(jpi,jpj,jpk) )
 
+#if ! defined key_offline
+      ! Concentration dilution effect on tracer due to evaporation, precipitation, and river runoff
+      IF( lk_vvl ) THEN   ;   zemps(:,:) = emps(:,:) - emp(:,:)   ! volume variable
+      ELSE                ;   zemps(:,:) = emps(:,:) - rnf(:,:)   ! linear free surface 
+      ENDIF 
+#else
+      ! emps in dynamical files contains emps - rnf
+      IF( lk_vvl ) THEN   ;   zemps(:,:) = 0.         ! No concentration/dilution effect 
+      ELSE                ;   zemps(:,:) = emps(:,:)  ! emps -rnf 
+      ENDIF
+#endif
       ! 0. initialization
       zsrau = 1. / rau0
@@ -85 +98 @@
 
       DO jn = 1, jptra
-         ! 1. Concentration dillution effect on tra
+         !
          IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn)  ! save trends
 
          DO jj = 2, jpj
             DO ji = fs_2, fs_jpim1   ! vector opt.
-#if ! defined key_zco
+#if ! defined key_zco 
                zse3t = 1. / fse3t(ji,jj,1)
 #endif
-               IF( lk_vvl ) THEN   ;   ztra = 0.e0                         ! No concent./dilut. effect
-               ELSE                ;   ztra = emps(ji,jj) * zsrau * trn(ji,jj,1,jn) * zse3t * tmask(ji,jj,1) 
-               ENDIF
+               ! add the trend to the general tracer trend
+               ztra = zemps(ji,jj) *  zsrau * trn(ji,jj,1,jn) * zse3t
                tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + ztra
             END DO
@@ -107 +119 @@
       END DO                                                     ! tracer loop
       !                                                          ! ===========
+      IF( l_trdtrc ) DEALLOCATE( ztrtrd )
 
-      IF( l_trdtrc ) DEALLOCATE( ztrtrd )
       IF( ln_ctl )   THEN
          WRITE(charout, FMT="('sbc ')") ;  CALL prt_ctl_trc_info(charout)