Changeset 9854 for branches/UKMO/dev_r7651_GO6pck_shlat2d/NEMOGCM/NEMO/TOP_SRC/C14b

Timestamp:

2018-06-28T15:59:16+02:00 (6 years ago)

Author:

mathiot

Message:

update to dev_r5518_GO6_package@9321 to avoid conflict during merge

Location:

branches/UKMO/dev_r7651_GO6pck_shlat2d/NEMOGCM/NEMO/TOP_SRC/C14b

Files:

• par_c14b.F90 (modified) (2 diffs)
• trcnam_c14b.F90 (modified) (2 diffs)

branches/UKMO/dev_r7651_GO6pck_shlat2d/NEMOGCM/NEMO/TOP_SRC/C14b/par_c14b.F90

@@ -11 +11 @@
    USE par_pisces , ONLY : jp_pisces_trd   !: number of biological diag in PISCES
 
+   USE par_medusa , ONLY : jp_medusa       !: number of tracers in MEDUSA
+   USE par_medusa , ONLY : jp_medusa_2d    !: number of 2D diag in MEDUSA
+   USE par_medusa , ONLY : jp_medusa_3d    !: number of 3D diag in MEDUSA
+   USE par_medusa , ONLY : jp_medusa_trd   !: number of biological diag in MEDUSA
+
+   USE par_idtra  , ONLY : jp_idtra        !: number of tracers in MEDUSA
+   USE par_idtra  , ONLY : jp_idtra_2d     !: number of tracers in MEDUSA
+   USE par_idtra  , ONLY : jp_idtra_3d     !: number of tracers in MEDUSA
+   USE par_idtra  , ONLY : jp_idtra_trd    !: number of tracers in MEDUSA
+
    USE par_cfc    , ONLY : jp_cfc          !: number of tracers in CFC
    USE par_cfc    , ONLY : jp_cfc_2d       !: number of 2D diag in CFC
@@ -19 +29 @@
    IMPLICIT NONE
 
-   INTEGER, PARAMETER ::   jp_lb      =  jp_pisces     + jp_cfc     !: cum. number of pass. tracers
-   INTEGER, PARAMETER ::   jp_lb_2d   =  jp_pisces_2d  + jp_cfc_2d  !:
-   INTEGER, PARAMETER ::   jp_lb_3d   =  jp_pisces_3d  + jp_cfc_3d  !:
-   INTEGER, PARAMETER ::   jp_lb_trd  =  jp_pisces_trd + jp_cfc_trd !:
+   INTEGER, PARAMETER ::   jp_lb      =  jp_pisces     + jp_medusa     +   &
+                      jp_idtra      + jp_cfc                               !: cum. number of pass. tracers
+   INTEGER, PARAMETER ::   jp_lb_2d   =  jp_pisces_2d  + jp_medusa_2d  +   &
+                      jp_idtra_2d   + jp_cfc_2d  !:
+   INTEGER, PARAMETER ::   jp_lb_3d   =  jp_pisces_3d  + jp_medusa_3d  +   &
+                      jp_idtra_3d   + jp_cfc_3d  !:
+   INTEGER, PARAMETER ::   jp_lb_trd  =  jp_pisces_trd + jp_medusa_trd +   &
+                      jp_idtra_trd  + jp_cfc_trd !:
    
 #if defined key_c14b

branches/UKMO/dev_r7651_GO6pck_shlat2d/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