Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zsed.F90

Timestamp:

2010-08-02T12:57:40+02:00 (14 years ago)

Author:

cetlod

Message:

Apply the merge to passive tracers, see ticket:693

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified) (3 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zsed.F90

@@ -93 +93 @@
       REAL(wp), DIMENSION(jpi,jpj)     ::   zsidep
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   znitrpot, zirondep
-#if defined key_diaadd || defined key_trc_dia3d 
+#if defined key_diatrc 
       REAL(wp) :: zrfact2
 # if defined key_iomput
@@ -286 +286 @@
                IF( zlim <= 0.2 )   zlim = 0.01
                znitrpot(ji,jj,jk) = MAX( 0.e0, ( 0.6 * tgfunc(ji,jj,jk) - 2.15 ) / rday )   &
-# if defined key_off_degrad
+# if defined key_degrad
                &                  * facvol(ji,jj,jk)   &
 # endif
@@ -325 +325 @@
       END DO
 
-#if defined key_trc_diaadd || defined key_trc_dia3d
+#if defined key_diatrc
       zrfact2 = 1.e+3 * rfact2r
 #  if  ! defined key_iomput