Changeset 1736 for trunk

Timestamp:

2009-11-16T16:49:43+01:00 (14 years ago)

Author:

cetlod

Message:

suppress useless variables in TOP modules, see ticket:602

Location:

trunk/NEMO/TOP_SRC

Files:

• C14b/trcsms_c14b.F90 (modified) (1 diff)
• PISCES/p4zmeso.F90 (modified) (1 diff)
• PISCES/p4zmicro.F90 (modified) (1 diff)
• PISCES/p4zmort.F90 (modified) (1 diff)
• PISCES/p4zprod.F90 (modified) (7 diffs)
• PISCES/p4zrem.F90 (modified) (1 diff)
• PISCES/p4zsink.F90 (modified) (4 diffs)

trunk/NEMO/TOP_SRC/C14b/trcsms_c14b.F90

@@ -134 +134 @@
          ! Computation of decay coeffcient
          zdemi   = 5730.
-         xlambda = LOG(2.) / zdemi / raass
+         xlambda = LOG(2.) / zdemi / ( nyear_len(1) * rday )
          xdecay  = EXP( - xlambda * rdt )
          xaccum  = 1.0 -  xdecay

trunk/NEMO/TOP_SRC/PISCES/p4zmeso.F90

@@ -96 +96 @@
       zgrazffe(:,:,:) = 0.
 
-      zstep = rfact2 / rjjss      ! Time step duration for biology
+      zstep = rfact2 / rday      ! Time step duration for biology
 
       DO jk = 1, jpkm1

trunk/NEMO/TOP_SRC/PISCES/p4zmicro.F90

@@ -89 +89 @@
 
 
-      zstep = rfact2 / rjjss      ! Time step duration for biology
+      zstep = rfact2 / rday      ! Time step duration for biology
 
       DO jk = 1, jpkm1

trunk/NEMO/TOP_SRC/PISCES/p4zmort.F90

@@ -64 +64 @@
       IF( ( kt * jnt ) == nittrc000  )   CALL p4z_mort_init      ! Initialization (first time-step only)
 
-      zstep = rfact2 / rjjss      ! Time step duration for biology
+      zstep = rfact2 / rday      ! Time step duration for biology
 
       CALL p4z_nano            ! nanophytoplankton

trunk/NEMO/TOP_SRC/PISCES/p4zprod.F90

@@ -113 +113 @@
 
 # if defined key_off_degrad
-      prmax(:,:,:) = 0.6 / rjjss * tgfunc(:,:,:) * facvol(:,:,:)
+      prmax(:,:,:) = 0.6 / rday * tgfunc(:,:,:) * facvol(:,:,:)
 # else
-      prmax(:,:,:) = 0.6 / rjjss * tgfunc(:,:,:)
+      prmax(:,:,:) = 0.6 / rday * tgfunc(:,:,:)
 # endif
 
@@ -161 +161 @@
                    zpislopen = zpislopead(ji,jj,jk) * trn(ji,jj,jk,jpnch)                 &
                      &         / ( trn(ji,jj,jk,jpphy) * 12.                   + rtrn )   &
-                     &         / ( prmax(ji,jj,jk) * rjjss * xlimphy(ji,jj,jk) + rtrn )
+                     &         / ( prmax(ji,jj,jk) * rday * xlimphy(ji,jj,jk) + rtrn )
 
                    zpislope2n = zpislopead2(ji,jj,jk) * trn(ji,jj,jk,jpdch)                &
                      &          / ( trn(ji,jj,jk,jpdia) * 12.                   + rtrn )   &
-                     &          / ( prmax(ji,jj,jk) * rjjss * xlimdia(ji,jj,jk) + rtrn )
+                     &          / ( prmax(ji,jj,jk) * rday * xlimdia(ji,jj,jk) + rtrn )
 
                    ! Computation of production function
@@ -212 +212 @@
          DO ji = 1, jpi
             zmxltst = MAX( 0.e0, hmld(ji,jj) - heup(ji,jj) )
-            zmxlday = zmxltst**2 / rjjss
+            zmxlday = zmxltst**2 / rday
             zmixnano(ji,jj) = 1.- zmxlday / ( 1.+ zmxlday )
             zmixdiat(ji,jj) = 1.- zmxlday / ( 3.+ zmxlday )
@@ -247 +247 @@
                   zpislopen = zpislopead(ji,jj,jk)          &
                   &         * trn(ji,jj,jk,jpnch) / ( rtrn + trn(ji,jj,jk,jpphy) * 12.)         &
-                  &         / ( prmax(ji,jj,jk) * rjjss * zmax + rtrn )
+                  &         / ( prmax(ji,jj,jk) * rday * zmax + rtrn )
 
                   zprbiochl = prmax(ji,jj,jk) * (  1.- EXP( -zpislopen * zetot2 )  )
@@ -255 +255 @@
                   zpronew(ji,jj,jk) = zprorca(ji,jj,jk) * xnanono3(ji,jj,jk)    &
                   &             / ( xnanono3(ji,jj,jk) + xnanonh4(ji,jj,jk) + rtrn )
-                  zprod = rjjss * zprorca(ji,jj,jk) * zprbiochl * trn(ji,jj,jk,jpphy) *zmax
+                  zprod = rday * zprorca(ji,jj,jk) * zprbiochl * trn(ji,jj,jk,jpphy) *zmax
 
                   zprofen(ji,jj,jk) = (fecnm)**2 * zprod / chlcnm            &
@@ -279 +279 @@
                   zpislope2n = zpislopead2(ji,jj,jk) * trn(ji,jj,jk,jpdch)        &
                   &           / ( rtrn + trn(ji,jj,jk,jpdia) * 12.)        &
-                  &           / ( prmax(ji,jj,jk) * rjjss * zmax + rtrn )
+                  &           / ( prmax(ji,jj,jk) * rday * zmax + rtrn )
 
                   zprdiachl = prmax(ji,jj,jk) * (  1.- EXP( -zetot2 * zpislope2n )  )
@@ -288 +288 @@
                   &              / ( xdiatno3(ji,jj,jk) + xdiatnh4(ji,jj,jk) + rtrn )
 
-                  zprod = rjjss * zprorcad(ji,jj,jk) * zprdiachl * trn(ji,jj,jk,jpdia) * zmax
+                  zprod = rday * zprorcad(ji,jj,jk) * zprdiachl * trn(ji,jj,jk,jpdia) * zmax
 
                   zprofed(ji,jj,jk) = (fecdm)**2 * zprod / chlcdm                   &

trunk/NEMO/TOP_SRC/PISCES/p4zrem.F90

@@ -80 +80 @@
       IF( ( kt * jnt ) == nittrc000  )   CALL p4z_rem_init      ! Initialization (first time-step only)
 
-       zstep = rfact2 / rjjss      ! Time step duration for the biology
+       zstep = rfact2 / rday      ! Time step duration for the biology
 
 

trunk/NEMO/TOP_SRC/PISCES/p4zsink.F90

@@ -111 +111 @@
       IF( ( kt * jnt ) == nittrc000  )  THEN 
           CALL p4z_sink_init   ! Initialization (first time-step only)
-          xstep  = rfact2 / rjjss      ! Time step duration for biology
+          xstep  = rfact2 / rday      ! Time step duration for biology
           xstep2 = rfact2 /  2.
       ENDIF
@@ -412 +412 @@
          zl = zmin
          zr = zmax
-         wmax = 0.5 * fse3t(1,1,jk) * rjjss / rfact2
+         wmax = 0.5 * fse3t(1,1,jk) * rday / rfact2
          zdiv = xkr_zeta + xkr_eta - xkr_eta * zl
          znum = zl - 1.
@@ -498 +498 @@
 
       IF( ( kt * jnt ) == nittrc000  )  THEN
-          xstep  = rfact2 / rjjss      ! Timestep duration for biology
+          xstep  = rfact2 / rday      ! Timestep duration for biology
           xstep2 = rfact2 /  2.
       ENDIF
@@ -674 +674 @@
       DO jk = 1, jpkm1
 # if defined key_off_degrad
-         zwsink2(:,:,jk+1) = -pwsink(:,:,jk) / rjjss * tmask(:,:,jk+1) * facvol(:,:,jk)
+         zwsink2(:,:,jk+1) = -pwsink(:,:,jk) / rday * tmask(:,:,jk+1) * facvol(:,:,jk)
 # else
-         zwsink2(:,:,jk+1) = -pwsink(:,:,jk) / rjjss * tmask(:,:,jk+1)
+         zwsink2(:,:,jk+1) = -pwsink(:,:,jk) / rday * tmask(:,:,jk+1)
 # endif
       END DO