Changeset 8657 for branches/NERC/dev_r5518_GO6_COAREbulk/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90

Timestamp:

2017-10-25T14:46:18+02:00 (7 years ago)

Author:

jpalmier

Message:

update the branch to match last GO6 changes

File:

• branches/NERC/dev_r5518_GO6_COAREbulk/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90 (modified) (3 diffs)

branches/NERC/dev_r5518_GO6_COAREbulk/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90

@@ -93 +93 @@
       INTEGER :: jl, jn
       INTEGER :: ios                 ! Local integer output status for namelist read
-      TYPE(DIAG), DIMENSION(jp_medusa_2d)  :: meddia2d
-      TYPE(DIAG), DIMENSION(jp_medusa_3d)  :: meddia3d
-      TYPE(DIAG), DIMENSION(jp_medusa_trd) :: meddiabio
       CHARACTER(LEN=32)   ::   clname
       !!
-      NAMELIST/nammeddia/ meddia3d, meddia2d     ! additional diagnostics
-
       !!----------------------------------------------------------------------
 
@@ -126 +121 @@
 # if defined key_debug_medusa
       CALL flush(numout)
-# endif
-      !
-# if defined key_debug_medusa
-      IF (lwp) write (numout,*) '------------------------------'
-      IF (lwp) write (numout,*) 'Jpalm - debug'
-      IF (lwp) write (numout,*) 'Just before reading namelist_medusa :: nammeddia'
-      IF (lwp) write (numout,*) ' '
-      CALL flush(numout)
-# endif
-
-     IF( ( .NOT.lk_iomput .AND. ln_diatrc ) .OR. ( ln_diatrc .AND. lk_medusa ) ) THEN
-         !
-         ! Namelist nammeddia
-         ! -------------------
-         REWIND( numnatp_ref )              ! Namelist nammeddia in reference namelist : MEDUSA diagnostics
-         READ  ( numnatp_ref, nammeddia, IOSTAT = ios, ERR = 901)
-901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nammeddia in reference namelist', lwp )
-
-         REWIND( numnatp_cfg )              ! Namelist nammeddia in configuration namelist : MEDUSA diagnostics
-         READ  ( numnatp_cfg, nammeddia, IOSTAT = ios, ERR = 902 )
-902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nammeddia in configuration namelist', lwp )
-         IF(lwm) WRITE ( numonp, nammeddia )
-
-# if defined key_debug_medusa
-         IF (lwp) write (numout,*) '------------------------------'
-         IF (lwp) write (numout,*) 'Jpalm - debug'
-         IF (lwp) write (numout,*) 'reading namelist_medusa :: nammeddia OK'
-         IF (lwp) write (numout,*) 'Check number of variable in nammeddia:'
-         IF (lwp) write (numout,*) 'jp_medusa_2d: ',jp_medusa_2d ,'jp_medusa_3d: ',jp_medusa_3d
-         IF (lwp) write (numout,*) ' '
-         CALL flush(numout)
-# endif
-         DO jl = 1, jp_medusa_2d
-            jn = jp_msa0_2d + jl - 1
-# if defined key_debug_medusa
-            IF (lwp) write (numout,*) 'Check what is readden in nammeddia: -- 2D'
-            IF (lwp) write (numout,*) jl,'meddia2d-sname: ',meddia2d(jl)%sname 
-            IF (lwp) write (numout,*) jl,'meddia2d-lname: ',meddia2d(jl)%lname 
-            IF (lwp) write (numout,*) jl,'meddia2d-units: ',meddia2d(jl)%units 
-            CALL flush(numout)
-# endif
-            ctrc2d(jn) = meddia2d(jl)%sname
-            ctrc2l(jn) = meddia2d(jl)%lname
-            ctrc2u(jn) = meddia2d(jl)%units
-         END DO
-
-         DO jl = 1, jp_medusa_3d
-            jn = jp_msa0_3d + jl - 1
-# if defined key_debug_medusa
-            IF (lwp) write (numout,*) 'Check what is readden in nammeddia: -- 3D'
-            IF (lwp) write (numout,*) jl,'meddia3d-sname: ',meddia3d(jl)%sname 
-            IF (lwp) write (numout,*) jl,'meddia3d-lname: ',meddia3d(jl)%lname
-            IF (lwp) write (numout,*) jl,'meddia3d-units: ',meddia3d(jl)%units
-            CALL flush(numout)
-# endif
-            ctrc3d(jn) = meddia3d(jl)%sname
-            ctrc3l(jn) = meddia3d(jl)%lname
-            ctrc3u(jn) = meddia3d(jl)%units
-         END DO
-
-         IF(lwp) THEN                   ! control print
-# if defined key_debug_medusa
-            IF (lwp) write (numout,*) '------------------------------'
-            IF (lwp) write (numout,*) 'Jpalm - debug'
-            IF (lwp) write (numout,*) 'Var name assignation OK'
-            IF (lwp) write (numout,*) 'next check var names'
-            IF (lwp) write (numout,*) ' '
-            CALL flush(numout)
-# endif
-            WRITE(numout,*)
-            WRITE(numout,*) ' Namelist : natadd'
-            DO jl = 1, jp_medusa_3d
-               jn = jp_msa0_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_medusa_2d
-               jn = jp_msa0_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 defined key_debug_medusa
-            CALL flush(numout)
 # endif
 
@@ -2148 +2053 @@
           med_diag%OCN_DPCO2%dgsave = .FALSE.
       ENDIF
-      !!
+      !! UKESM additional
+      IF  (iom_use("CHL_MLD")) THEN 
+          med_diag%CHL_MLD%dgsave = .TRUE.
+      ELSE 
+          med_diag%CHL_MLD%dgsave = .FALSE.
+      ENDIF
+      !! 3D
       IF  (iom_use("TPP3")) THEN 
           med_diag%TPP3%dgsave = .TRUE.