Changeset 1119 for trunk/NEMO/TOP_SRC/PISCES/p4zsink.F90

Timestamp:

2008-06-20T17:17:41+02:00 (16 years ago)

Author:

cetlod

Message:

style of all top namelist has been modified ; update modules to take it into account, see ticket:196

File:

• trunk/NEMO/TOP_SRC/PISCES/p4zsink.F90 (modified) (5 diffs)

trunk/NEMO/TOP_SRC/PISCES/p4zsink.F90

@@ -12 +12 @@
    USE trc
    USE oce_trc         !
-   USE trp_trc
    USE sms_pisces
    USE prtctl_trc
@@ -279 +278 @@
 #    if defined key_trc_dia3d
       zrfact2 = 1.e3 * rfact2r
-      trc2d(:,:, 5)   = sinking (:,:,iksed+1) * zrfact2
-      trc2d(:,:, 6)   = sinking2(:,:,iksed+1) * zrfact2
-      trc2d(:,:, 7)   = sinkfer (:,:,iksed+1) * zrfact2
-      trc2d(:,:, 9)   = sinksil (:,:,iksed+1) * zrfact2
-      trc2d(:,:,10)   = sinkcal (:,:,iksed+1) * zrfact2
-      trc3d(:,:,:,12) = sinking (:,:,:)       * zrfact2
-      trc3d(:,:,:,13) = sinking2(:,:,:)       * zrfact2
-      trc3d(:,:,:,14) = sinksil (:,:,:)       * zrfact2
-      trc3d(:,:,:,15) = sinkcal (:,:,:)       * zrfact2
-      trc3d(:,:,:,16) = znum3d  (:,:,:)
-      trc3d(:,:,:,17) = wsbio3  (:,:,:)
-      trc3d(:,:,:,18) = wsbio4  (:,:,:)
+      trc2d(:,:,  jp_pcs0_2d + 4)   = sinking (:,:,iksed+1) * zrfact2
+      trc2d(:,:,  jp_pcs0_2d + 5)   = sinking2(:,:,iksed+1) * zrfact2
+      trc2d(:,:,  jp_pcs0_2d + 6)   = sinkfer (:,:,iksed+1) * zrfact2
+      trc2d(:,:,  jp_pcs0_2d + 8)   = sinksil (:,:,iksed+1) * zrfact2
+      trc2d(:,:,  jp_pcs0_2d + 9)   = sinkcal (:,:,iksed+1) * zrfact2
+      trc3d(:,:,:,jp_pcs0_3d + 11) = sinking (:,:,:)       * zrfact2
+      trc3d(:,:,:,jp_pcs0_3d + 12) = sinking2(:,:,:)       * zrfact2
+      trc3d(:,:,:,jp_pcs0_3d + 13) = sinksil (:,:,:)       * zrfact2
+      trc3d(:,:,:,jp_pcs0_3d + 14) = sinkcal (:,:,:)       * zrfact2
+      trc3d(:,:,:,jp_pcs0_3d + 15) = znum3d  (:,:,:)
+      trc3d(:,:,:,jp_pcs0_3d + 16) = wsbio3  (:,:,:)
+      trc3d(:,:,:,jp_pcs0_3d + 17) = wsbio4  (:,:,:)
 #    endif
       !
@@ -308 +307 @@
       !!                Kriest parameterization only
       !!
-      !! ** Method  :   Read the natkriest namelist and check the parameters
+      !! ** Method  :   Read the nampiskrs namelist and check the parameters
       !!      called at the first timestep (nittrc000)
       !!
-      !! ** input   :   Namelist natkriest
+      !! ** input   :   Namelist nampiskrs
       !!
       !!----------------------------------------------------------------------
@@ -319 +318 @@
       REAL(wp) ::   zmin, zmax, zl, zr, xacc
 
-      NAMELIST/natkrsize/ xkr_sfact, xkr_stick ,  &
+      NAMELIST/nampiskrs/ xkr_sfact, xkr_stick ,  &
          &                xkr_nnano, xkr_ndiat, xkr_nmeso, xkr_naggr
 
       !!----------------------------------------------------------------------
-      !                               ! natkriest : kriest parameters
-      !                               ! -----------------------------
-      REWIND( numnat )                     ! read natkriest
-      READ  ( numnat, natkrsize )
+      REWIND( numnat )                     ! read nampiskrs
+      READ  ( numnat, nampiskrs )
 
       IF(lwp) THEN
          WRITE(numout,*)
-         WRITE(numout,*) ' Namelist : natkrsize'
+         WRITE(numout,*) ' Namelist : nampiskrs'
          WRITE(numout,*) '    Sinking factor                           xkr_sfact    = ', xkr_sfact
          WRITE(numout,*) '    Stickiness                               xkr_stick    = ', xkr_stick
@@ -594 +591 @@
       END DO
 
-# if defined key_trc_dia3d
+# if defined key_trc_diaadd
       zrfact2 = 1.e3 * rfact2r
-      trc2d(:,:, 5) = sinking (:,:,iksed+1) * zrfact2
-      trc2d(:,:, 6) = sinking2(:,:,iksed+1) * zrfact2
-      trc2d(:,:, 7) = sinkfer (:,:,iksed+1) * zrfact2
-      trc2d(:,:, 8) = sinkfer2(:,:,iksed+1) * zrfact2
-      trc2d(:,:, 9) = sinksil (:,:,iksed+1) * zrfact2
-      trc2d(:,:,10) = sinkcal (:,:,iksed+1) * zrfact2
+      trc2d(:,:, jp_pcs0_2d + 4) = sinking (:,:,iksed+1) * zrfact2
+      trc2d(:,:, jp_pcs0_2d + 5) = sinking2(:,:,iksed+1) * zrfact2
+      trc2d(:,:, jp_pcs0_2d + 6) = sinkfer (:,:,iksed+1) * zrfact2
+      trc2d(:,:, jp_pcs0_2d + 7) = sinkfer2(:,:,iksed+1) * zrfact2
+      trc2d(:,:, jp_pcs0_2d + 8) = sinksil (:,:,iksed+1) * zrfact2
+      trc2d(:,:, jp_pcs0_2d + 9) = sinkcal (:,:,iksed+1) * zrfact2
 # endif
       !