Changeset 9169 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcice.F90

Timestamp:

2017-12-26T17:32:56+01:00 (7 years ago)

Author:

gm

Message:

dev_merge_2017: all SRC: finalize the removal of useless warning when reading namelist_cfg + remove all nn_closea + nn_msh replaced by a logical

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcice.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcice.F90

@@ -10 +10 @@
    !!   'key_top'                                                TOP models
    !!----------------------------------------------------------------------
-   !!   trc_ice   :  Call the appropriate sea ice tracer subroutine
+   !!   trc_ice       :  Call the appropriate sea ice tracer subroutine
    !!----------------------------------------------------------------------
-   USE oce_trc         ! shared variables between ocean and passive tracers
-   USE trc             ! passive tracers common variables
-   USE trcice_cfc      ! CFC      initialisation
-   USE trcice_pisces   ! PISCES   initialisation
-   USE trcice_c14      ! C14 bomb initialisation
-   USE trcice_age      ! aGE initialisation
-   USE trcice_my_trc   ! MY_TRC   initialisation
+   USE oce_trc        ! shared variables between ocean and passive tracers
+   USE trc            ! passive tracers common variables
+   USE trcice_cfc     ! CFC      initialisation
+   USE trcice_pisces  ! PISCES   initialisation
+   USE trcice_c14     ! C14 bomb initialisation
+   USE trcice_age     ! AGE      initialisation
+   USE trcice_my_trc  ! MY_TRC   initialisation
    
    IMPLICIT NONE
@@ -39 +39 @@
       !!
       !! ** Method  : - 
-      !!            
       !!---------------------------------------------------------------------
       !
@@ -71 +70 @@
       !!
       !! ** Method  : -
-      !!
       !!---------------------------------------------------------------------
       INTEGER :: jn      ! dummy loop indices
       INTEGER :: ios, ierr     ! Local integer output status for namelist read
       !
-      TYPE(TRC_I_NML), DIMENSION(jpmaxtrc) :: sn_tri_tracer
+      TYPE(TRC_I_NML), DIMENSION(jpmaxtrc) ::   sn_tri_tracer
       !!
       NAMELIST/namtrc_ice/ nn_ice_tr, sn_tri_tracer
@@ -89 +87 @@
       REWIND( numnat_ref )              ! Namelist namtrc_ice in reference namelist : Passive tracer input data
       READ  ( numnat_ref, namtrc_ice, IOSTAT = ios, ERR = 901)
- 901  IF( ios /= 0 ) CALL ctl_nam ( ios , ' namtrc_ice in reference namelist ', lwp )
-
+ 901  IF( ios /= 0 )   CALL ctl_nam ( ios , ' namtrc_ice in reference namelist ', lwp )
       REWIND( numnat_cfg )              ! Namelist namtrc_ice in configuration namelist : Pisces external sources of nutrients
       READ  ( numnat_cfg, namtrc_ice, IOSTAT = ios, ERR = 902 )
- 902  IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_ice in configuration namelist', lwp )
+ 902  IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrc_ice in configuration namelist', lwp )
 
       IF( lwp ) THEN
          WRITE(numout,*) ' '
-         WRITE(numout,*) ' Sea ice tracers option (nn_ice_tr) : ', nn_ice_tr
-         WRITE(numout,*) ' '
+         WRITE(numout,*) '   Namelist : namtrc_ice'
+         WRITE(numout,*) '      Sea ice tracers option (nn_ice_tr) : ', nn_ice_tr
       ENDIF
       !