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

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

@@ -84 +84 @@
       zgrazpf(:,:,:) = 0.
 
-#if defined key_trc_dia3d
+#if defined key_diatrc
       grazing(:,:,:) = 0.  !: Initialisation of  grazing
 #endif
@@ -95 +95 @@
 
                zcompaz = MAX( ( trn(ji,jj,jk,jpzoo) - 1.e-9 ), 0.e0 )
-# if defined key_off_degrad
+# if defined key_degrad
                zfact   = zstep * tgfunc(ji,jj,jk) * zcompaz *facvol(ji,jj,jk)
 # else
@@ -132 +132 @@
 
                zgraze = grazrat * zstep * tgfunc(ji,jj,jk)     &
-# if defined key_off_degrad
+# if defined key_degrad
                   &      * facvol(ji,jj,jk)         &
 # endif
@@ -155 +155 @@
       END DO
       
-#if defined key_trc_dia3d
+#if defined key_diatrc
       ! Grazing by microzooplankton
       grazing(:,:,:) = grazing(:,:,:) + zgrazp(:,:,:) + zgrazm(:,:,:) + zgrazsd(:,:,:) 
@@ -220 +220 @@
                  &     - (1.-unass) * zgrazmf(ji,jj,jk)
                zprcaca = xfracal(ji,jj,jk) * unass * zgrazp(ji,jj,jk)
-#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