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

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

@@ -136 +136 @@
 !     ----------------------------------------------------------------
                zremik = xremik * xstep / 1.e-6 * xlimbac(ji,jj,jk)         &
-# if defined key_off_degrad
+# if defined key_degrad
                   &            * facvol(ji,jj,jk)              &
 # endif
@@ -172 +172 @@
 !    ----------------------------------------------------------
                zonitr  = nitrif * xstep * trn(ji,jj,jk,jpnh4) / ( 1.+ emoy(ji,jj,jk) )     &
-# if defined key_off_degrad
+# if defined key_degrad
                   &      * facvol(ji,jj,jk)              &
 # endif
@@ -234 +234 @@
 !    -------------------------------------------------------------
                zremip = xremip * xstep * tgfunc(ji,jj,jk)   &
-# if defined key_off_degrad
+# if defined key_degrad
                   &            * facvol(ji,jj,jk)              &
 # endif
@@ -289 +289 @@
                zsatur2 = zsatur * ( 1. + tn(ji,jj,jk) / 400.)**4
                znusil  = 0.225  * ( 1. + tn(ji,jj,jk) / 15.) * zsatur + 0.775 * zsatur2**9
-#    if defined key_off_degrad
+#    if defined key_degrad
                zsiremin = xsirem * xstep * znusil * facvol(ji,jj,jk)
 # else
@@ -350 +350 @@
 #endif
 
-# if defined key_off_degrad
+# if defined key_degrad
                zscave = zfeequi * zlam1b * xstep  * facvol(ji,jj,jk)
 # else
@@ -374 +374 @@
 #endif
 
-# if defined key_off_degrad
+# if defined key_degrad
                zaggdfe = zlam1b * xstep * 0.5 * ( trn(ji,jj,jk,jpfer) - zfeequi ) * facvol(ji,jj,jk)
 # else