Changeset 1119 for trunk/NEMO/TOP_SRC/trclec.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/trclec.F90 (modified) (8 diffs)

trunk/NEMO/TOP_SRC/trclec.F90

@@ -20 +20 @@
    USE oce_trc
    USE trc
+   USE trp_trc
    USE trctrp_lec
    USE trclsm_lobster    ! LOBSTER namelist
@@ -66 +67 @@
       TYPE(PTRACER) , DIMENSION(jptra) :: tracer
 
-#if defined key_trc_diaadd
-      ! definition of additional diagnostic as a structure
-      TYPE DIAG
-         CHARACTER(len = 20)  :: snamedia   !: short name
-         CHARACTER(len = 80 ) :: lnamedia   !: long name
-         CHARACTER(len = 20 ) :: unitdia    !: unit
-      END TYPE DIAG
-
-      TYPE(DIAG) , DIMENSION(jpdia2d) :: diag2d
-      TYPE(DIAG) , DIMENSION(jpdia3d) :: diag3d
+      !!
+      NAMELIST/namtoptrc/ ndttrc, nwritetrc, lrsttr, nrsttr, tracer
+#if defined key_trc_diatrd
+      NAMELIST/namtoptrd/ luttrd, nwritetrd                                             ! dynamical trends
 #endif
 
-      !!
-      NAMELIST/nattrc/ nwritetrc, lrsttr, nrsttr, tracer
-      NAMELIST/natnum/ rsc, rtrn, ncortrc, ndttrc, crosster
-#if defined key_trc_diatrd
-      NAMELIST/natrtd/ luttrd, nwritetrd                                             ! dynamical trends
-#endif
-#if defined key_trc_diaadd
-      NAMELIST/natdia/nwritedia, diag3d, diag2d     ! additional diagnostics
-#endif
       !!---------------------------------------------------------------------
 
@@ -99 +85 @@
       ! Namelist nattrc (files)
       ! ----------------------------------------------
-      nwritetrc = 10                 ! default values
+      ndttrc    = 1                 ! default values
+      nwritetrc = 10      
       lrsttr    = .FALSE.
       nrsttr    =  0
@@ -111 +98 @@
 
       REWIND( numnat )               ! read nattrc
-      READ  ( numnat, nattrc )
+      READ  ( numnat, namtoptrc )
+
+      !!Chris  computes the first time step of tracer model
+      nittrc000 = nit000 + ndttrc - 1
 
       DO jn = 1, jptra
@@ -122 +112 @@
 
 
-
       IF(lwp) THEN                   ! control print
          WRITE(numout,*)
-         WRITE(numout,*) ' Namelist : nattrc'
+         WRITE(numout,*) ' Namelist : namtoptrc'
+         WRITE(numout,*) '    time step freq. for pass. trac. ndttrc             = ', ndttrc
+         WRITE(numout,*) '    1st time step for pass. trac. nittrc000            = ', nittrc000
          WRITE(numout,*) '    frequency of outputs for passive tracers nwritetrc = ', nwritetrc  
-         WRITE(numout,*) '    restart LOGICAL for passive tr. lrsttr = ', lrsttr
-         WRITE(numout,*) '    control of time step for p. tr. nrsttr = ', nrsttr
+         WRITE(numout,*) '    restart LOGICAL for passive tr. lrsttr             = ', lrsttr
+         WRITE(numout,*) '    control of time step for p. tr. nrsttr             = ', nrsttr
          DO jn = 1, jptra
             WRITE(numout,*) '   tracer nb             : ', jn 
@@ -150 +141 @@
 
       REWIND( numnat )               ! read natrtd
-      READ  ( numnat, natrtd )
+      READ  ( numnat, namtoptrd )
 
       nkeep=0
@@ -167 +158 @@
       IF(lwp) THEN                   ! control print
          WRITE(numout,*)
-         WRITE(numout,*) ' Namelist : natrtd'
+         WRITE(numout,*) ' Namelist : namtoptrd'
          WRITE(numout,*) '    frequency of outputs for dynamical trends nwritetrd = ', nwritetrd
          DO jn = 1, jptra
@@ -177 +168 @@
 #endif
 
-#if defined key_trc_diaadd
-
-      ! Namelist natrtd (transport trends)
-      ! ----------------------------------------------
-      nwritedia = 10                 ! default values 
-      !                                 ! 2D output arrays
-      DO jn = 1, jpdia2d
-         WRITE(ctrc2d(jn),'("2D_",I1)') jn                      ! short name
-         WRITE(ctrc2l(jn),'("2D DIAGNOSTIC NUMBER ",I2)') jn    ! long name
-         ctrc2u(jn) = ' '                                       ! units 
-      END DO
-      !                                 ! 3D output arrays
-      DO jn = 1, jpdia3d
-         WRITE(ctrc3d(jn),'("3D_",I1)') jn                     ! short name
-         WRITE(ctrc3l(jn),'("3D DIAGNOSTIC NUMBER ",I2)') jn    ! long name
-         ctrc3u(jn) = ' '                                       ! units
-      END DO
-
-      REWIND( numnat )               ! read natrtd
-      READ  ( numnat, natdia )
-
-      DO jn = 1, jpdia2d
-         ctrc2d(jn) = diag2d(jn)%snamedia
-         ctrc2l(jn) = diag2d(jn)%lnamedia
-         ctrc2u(jn) = diag2d(jn)%unitdia
-      END DO
-
-      DO jn = 1, jpdia3d
-         ctrc3d(jn) = diag3d(jn)%snamedia
-         ctrc3l(jn) = diag3d(jn)%lnamedia
-         ctrc3u(jn) = diag3d(jn)%unitdia
-      END DO
-
-      IF(lwp) THEN                   ! control print
-         WRITE(numout,*)
-         WRITE(numout,*) ' Namelist : natadd'
-         WRITE(numout,*) '    frequency of outputs for additional arrays nwritedia = ', nwritedia
-         DO jn = 1, jpdia3d
-            WRITE(numout,*) '   3d output field No : ',jn
-            WRITE(numout,*) '   short name         : ', TRIM(ctrc3d(jn))
-            WRITE(numout,*) '   long name          : ', TRIM(ctrc3l(jn))
-            WRITE(numout,*) '   unit               : ', TRIM(ctrc3u(jn))
-            WRITE(numout,*) ' '
-         END DO
-
-         DO jn = 1, jpdia2d
-            WRITE(numout,*) '   2d output field No : ',jn
-            WRITE(numout,*) '   short name         : ', TRIM(ctrc2d(jn))
-            WRITE(numout,*) '   long name          : ', TRIM(ctrc2l(jn))
-            WRITE(numout,*) '   unit               : ', TRIM(ctrc2u(jn))
-            WRITE(numout,*) ' '
-         END DO
-      ENDIF
-#endif
-
-      !! Namelist natnum :
-      !! -----------------
-      rsc      = 1.                 ! default values
-      rtrn     = 1.e-15
-      ncortrc  = 1
-      ndttrc   = 4
-      crosster = .FALSE.
-
-      REWIND( numnat )              ! read natnum
-      READ  ( numnat, natnum )
-
-      !!Chris  computes the first time step of tracer model
-      nittrc000 = nit000 + ndttrc - 1
-
-      IF(lwp) THEN                  ! control print
-         WRITE(numout,*)
-         WRITE(numout,*) ' Namelist : natnum'
-         WRITE(numout,*)
-         WRITE(numout,*) ' tuning coefficient              rsc     = ', rsc
-         WRITE(numout,*) ' truncation value                rtrn    = ', rtrn
-         WRITE(numout,*) ' number of corrective phase      ncortrc = ', ncortrc
-         WRITE(numout,*) ' time step freq. for pass. trac. ndttrc  = ', ndttrc
-         WRITE(numout,*) ' 1st time step for pass. trac. nittrc000 = ', nittrc000
-         WRITE(numout,*) ' computes or not crossterms    crosster  = ', crosster
-      ENDIF
 
       ! namelist of transport