Changeset 3294 for trunk/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90

@@ -16 +16 @@
    USE trc             ! TOP variables
    USE trcsms_cfc      ! CFC specific variable
+   USE iom             ! I/O manager
 
    IMPLICIT NONE
@@ -37 +38 @@
       !!
       !! ** Method  :   Read the namcfc namelist and check the parameter 
-      !!       values called at the first timestep (nit000)
+      !!       values called at the first timestep (nittrc000)
       !!
       !! ** input   :   Namelist namcfc
       !!----------------------------------------------------------------------
-      INTEGER ::   numnatc
-#if defined key_diatrc && ! defined key_iomput
-      ! definition of additional diagnostic as a structure
+      INTEGER ::  numnatc
       INTEGER :: jl, jn
-      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(jp_cfc_2d) :: cfcdia2d
-#endif
+      TYPE(DIAG), DIMENSION(jp_cfc_2d) :: cfcdia2d
       !!
       NAMELIST/namcfcdate/ ndate_beg, nyear_res
-#if defined key_diatrc && ! defined key_iomput
-      NAMELIST/namcfcdia/nn_writedia, cfcdia2d     ! additional diagnostics
-#endif
+      NAMELIST/namcfcdia/  cfcdia2d     ! additional diagnostics
       !!-------------------------------------------------------------------
 
@@ -78 +68 @@
       IF(lwp) WRITE(numout,*) '    initial year (aa)                       nyear_beg = ', nyear_beg
       !
-#if defined key_diatrc && ! defined key_iomput
 
-      ! Namelist namcfcdia
-      ! -------------------
-      nn_writedia = 10                   ! default values
+      IF( .NOT.lk_iomput .AND. ln_diatrc ) THEN
+         !
+         ! Namelist namcfcdia
+         ! -------------------
+         DO jl = 1, jp_cfc_2d
+            WRITE(cfcdia2d(jl)%sname,'("2D_",I1)') jl                      ! short name
+            WRITE(cfcdia2d(jl)%lname,'("2D DIAGNOSTIC NUMBER ",I2)') jl    ! long name
+            cfcdia2d(jl)%units = ' '                                       ! units
+         END DO
 
-      DO jl = 1, jp_cfc_2d
-         jn = jp_cfc0_2d + jl - 1 
-         WRITE(ctrc2d(jn),'("2D_",I1)') jn                      ! short name
-         WRITE(ctrc2l(jn),'("2D DIAGNOSTIC NUMBER ",I2)') jn    ! long name
-         ctrc2u(jn) = ' '                                       ! units
-      END DO
+         REWIND( numnatc )               ! read natrtd
+         READ  ( numnatc, namcfcdia )
 
-      REWIND( numnatc )               ! read natrtd
-      READ  ( numnatc, namcfcdia )
-
-      DO jl = 1, jp_cfc_2d
-         jn = jp_cfc0_2d + jl - 1
-         ctrc2d(jn) = cfcdia2d(jl)%snamedia
-         ctrc2l(jn) = cfcdia2d(jl)%lnamedia
-         ctrc2u(jn) = cfcdia2d(jl)%unitdia
-      END DO
-
-
-      IF(lwp) THEN                   ! control print
-         WRITE(numout,*)
-         WRITE(numout,*) ' Namelist : natadd'
-         WRITE(numout,*) '    frequency of outputs for additional arrays nn_writedia = ', nn_writedia
          DO jl = 1, jp_cfc_2d
             jn = jp_cfc0_2d + jl - 1
-            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))
+            ctrc2d(jn) = TRIM( cfcdia2d(jl)%sname )
+            ctrc2l(jn) = TRIM( cfcdia2d(jl)%lname )
+            ctrc2u(jn) = TRIM( cfcdia2d(jl)%units )
+         END DO
+
+         IF(lwp) THEN                   ! control print
+            WRITE(numout,*)
+            WRITE(numout,*) ' Namelist : natadd'
+            DO jl = 1, jp_cfc_2d
+               jn = jp_cfc0_2d + jl - 1
+               WRITE(numout,*) '  2d diag nb : ', jn, '    short name : ', ctrc2d(jn), &
+                 &             '  long name  : ', ctrc2l(jn), '   unit : ', ctrc2u(jn)
+            END DO
             WRITE(numout,*) ' '
-         END DO
+         ENDIF
+         !
       ENDIF
-#endif
 
    END SUBROUTINE trc_nam_cfc