Changeset 2115

Timestamp:

2010-09-23T18:52:39+02:00 (14 years ago)

Author:

cetlod

Message:

improve trcsbc.F90 routine in DEV_r2006_merge_TRA_TRC branch

Location:

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC

Files:

• TRP/trcsbc.F90 (modified) (2 diffs)
• oce_trc.F90 (modified) (1 diff)

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

@@ -82 +82 @@
 #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 
+      IF( lk_vvl ) THEN                      ! volume variable
+         zemps(:,:) = emps(:,:) - emp(:,:)   
+      ELSE                                   ! linear free surface
+         IF( ln_rnf ) THEN  ;  zemps(:,:) = emps(:,:) - rnf(:,:)   !  E-P-R
+         ELSE               ;  zemps(:,:) = emps(:,:)
+         ENDIF 
       ENDIF 
 #else
@@ -91 +95 @@
       ENDIF
 #endif
+
       ! 0. initialization
       zsrau = 1. / rau0
-#if defined key_zco
-      zse3t = 1. / e3t_0(1)
-#endif
-
       DO jn = 1, jptra
          !
          IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn)  ! save trends
-
+         !                                             ! add the trend to the general tracer trend
          DO jj = 2, jpj
             DO ji = fs_2, fs_jpim1   ! vector opt.
-#if ! defined key_zco 
                zse3t = 1. / fse3t(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
+               tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + zemps(ji,jj) *  zsrau * trn(ji,jj,1,jn) * zse3t
             END DO
          END DO

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90

@@ -201 +201 @@
    USE sbc_oce , ONLY :   emps       =>    emps       !: freshwater budget: concentration/dillution   [Kg/m2/s]
    USE sbc_oce , ONLY :   rnf        =>    rnf        !: river runoff   [Kg/m2/s]
+   USE sbc_oce , ONLY :   ln_rnf     =>    ln_rnf     !: runoffs / runoff mouths
    USE sbc_oce , ONLY :   fr_i       =>    fr_i       !: ice fraction (between 0 to 1)
    USE traqsr  , ONLY :   rn_abs     =>    rn_abs     !: fraction absorbed in the very near surface