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

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

@@ -89 +89 @@
 
 
-#if defined key_trc_dia3d
+#if defined key_diatrc
      prodcal(:,:,:) = 0.  !: Initialisation of calcite production variable
 #endif
@@ -103 +103 @@
 !     -----------------------------------------------------------------
                zrespp = wchl * 1.e6 * zstep * xdiss(ji,jj,jk)   &
-# if defined key_off_degrad
+# if defined key_degrad
                   &        * facvol(ji,jj,jk)     &
 # endif
@@ -113 +113 @@
 !     ----------------------------------------------------------
                ztortp = mprat * zstep * trn(ji,jj,jk,jpphy)          &
-# if defined key_off_degrad
+# if defined key_degrad
                   &          * facvol(ji,jj,jk)     &
 # endif
@@ -130 +130 @@
                tra(ji,jj,jk,jpnfe) = tra(ji,jj,jk,jpnfe) - zmortp * zfactfe
                zprcaca = xfracal(ji,jj,jk) * zmortp
-#if defined key_trc_dia3d
+#if defined key_diatrc
                prodcal(ji,jj,jk) = prodcal(ji,jj,jk) + zprcaca  ! prodcal=prodcal(nanophy)+prodcal(microzoo)+prodcal(mesozoo)
 #endif
@@ -192 +192 @@
 
                zrespp2  = 1.e6 * zstep * (  wchl + wchld * ( 1.- xlimdia(ji,jj,jk) )  )    &
-# if defined key_off_degrad
+# if defined key_degrad
                   &       * facvol(ji,jj,jk)       &
 # endif
@@ -201 +201 @@
 !     ------------------------
                ztortp2  = mprat2 * zstep * trn(ji,jj,jk,jpdia)     &
-# if defined key_off_degrad
+# if defined key_degrad
                   &        * facvol(ji,jj,jk)       &
 # endif