Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zprod.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/p4zprod.F90 (modified) (5 diffs)

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

@@ -79 +79 @@
       REAL(wp) ::   zpislopen  , zpislope2n
       REAL(wp) ::   zrum, zcodel, zargu, zvol
-#if defined key_trc_diaadd && defined key_trc_dia3d
+#if defined key_diatrc
       REAL(wp) ::   zrfact2
 #endif
@@ -109 +109 @@
       ! Computation of the optimal production
 
-# if defined key_off_degrad
+# if defined key_degrad
       prmax(:,:,:) = 0.6 / rday * tgfunc(:,:,:) * facvol(:,:,:)
 # else
@@ -335 +335 @@
           DO ji = 1, jpi
              zvol = cvol(ji,jj,jk)
-#if defined key_off_degrad
+#if defined key_degrad
              zvol = zvol * facvol(ji,jj,jk)
 #endif
@@ -353 +353 @@
       ENDIF
 
-#if defined key_trc_diaadd && defined key_trc_dia3d && ! defined key_iomput
+#if defined key_diatrc && ! defined key_iomput
       !   Supplementary diagnostics
       zrfact2 = 1.e3 * rfact2r
@@ -367 +367 @@
 #endif
 
-#if defined key_trc_diaadd && defined key_trc_dia3d && defined key_iomput
+#if defined key_diatrc && defined key_iomput
       zrfact2 = 1.e3 * rfact2r
       IF ( jnt == nrdttrc ) then