Changeset 8442 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/C14b

Timestamp:

2017-08-17T13:39:18+02:00 (7 years ago)

Author:

frrh

Message:

Commit changes relating to Met Office GMED ticket 340 for the
tidying of MEDUSA related code and debugging statements in the TOP code.

Only code introduced at revision 8434 of branch
​http://fcm3/projects/NEMO.xm/log/branches/NERC/dev_r5518_GO6_split_trcbiomedusa
is included here, all previous revisions of that branch having been dealt with
under GMED ticket 339.

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/C14b/trcnam_c14b.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/C14b/trcnam_c14b.F90

@@ -49 +49 @@
       ! definition of additional diagnostic as a structure
       INTEGER :: jl, jn
-      TYPE(DIAG), DIMENSION(jp_c14b_2d) :: c14dia2d
-      TYPE(DIAG), DIMENSION(jp_c14b_3d) :: c14dia3d
       !!
       NAMELIST/namc14date/ ndate_beg_b, nyear_res_b
-      NAMELIST/namc14dia/  c14dia2d, c14dia3d     ! additional diagnostics
       !!-------------------------------------------------------------------
       !                             ! Open namelist file
@@ -77 +74 @@
       IF(lwp) WRITE(numout,*) '    initial year (aa)                  nyear_beg_b = ', nyear_beg_b
       !
-      IF( .NOT.lk_iomput .AND. ln_diatrc ) THEN
-         !
-         ! Namelist namc14dia
-         ! -------------------
-         REWIND( numnatb_ref )              ! Namelist namc14dia in reference namelist : c14b diagnostics
-         READ  ( numnatb_ref, namc14dia, IOSTAT = ios, ERR = 903)
-903      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namc14dia in reference namelist', lwp )
-
-         REWIND( numnatb_cfg )              ! Namelist namc14dia in configuration namelist : c14b diagnostics
-         READ  ( numnatb_cfg, namc14dia, IOSTAT = ios, ERR = 904 )
-904      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namc14dia in configuration namelist', lwp )
-         IF(lwm) WRITE ( numonb, namc14dia )
-
-         DO jl = 1, jp_c14b_2d
-            jn = jp_c14b0_2d + jl - 1
-            ctrc2d(jn) = c14dia2d(jl)%sname
-            ctrc2l(jn) = c14dia2d(jl)%lname
-            ctrc2u(jn) = c14dia2d(jl)%units
-         END DO
-
-         DO jl = 1, jp_c14b_3d
-            jn = jp_c14b0_3d + jl - 1
-            ctrc3d(jn) = c14dia3d(jl)%sname
-            ctrc3l(jn) = c14dia3d(jl)%lname
-            ctrc3u(jn) = c14dia3d(jl)%units
-         END DO
-
-         IF(lwp) THEN                   ! control print
-            WRITE(numout,*)
-            WRITE(numout,*) ' Namelist : natadd'
-            DO jl = 1, jp_c14b_3d
-               jn = jp_c14b0_3d + jl - 1
-               WRITE(numout,*) '  3d diag nb : ', jn, '    short name : ', ctrc3d(jn), &
-                 &             '  long name  : ', ctrc3l(jn), '   unit : ', ctrc3u(jn)
-            END DO
-            WRITE(numout,*) ' '
-
-            DO jl = 1, jp_c14b_2d
-               jn = jp_c14b0_2d + jl - 1
-               WRITE(numout,*) '  2d diag nb : ', jn, '    short name : ', ctrc2d(jn), &
-                 &             '  long name  : ', ctrc2l(jn), '   unit : ', ctrc2u(jn)
-            END DO
-            WRITE(numout,*) ' '
-         ENDIF
-         !
-      ENDIF
 
    IF(lwm) CALL FLUSH ( numonb )     ! flush output namelist C14b