Changeset 9169 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_da.F90

Timestamp:

2017-12-26T17:32:56+01:00 (6 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/LIM_SRC_3/icethd_da.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_da.F90

@@ -10 +10 @@
    !!   'key_lim3'                                       ESIM sea-ice model
    !!----------------------------------------------------------------------
-   !!   ice_thd_da        : sea ice lateral melting
-   !!   ice_thd_da_init   : sea ice lateral melting initialization
+   !!   ice_thd_da      : sea ice lateral melting
+   !!   ice_thd_da_init : sea ice lateral melting initialization
    !!----------------------------------------------------------------------
    USE par_oce        ! ocean parameters
@@ -28 +28 @@
    PUBLIC   ice_thd_da_init   ! called by icestp.F90
 
-   ! ** namelist (namthd_da) **
-   REAL(wp) ::   rn_beta     ! coef. beta for lateral melting param.
-   REAL(wp) ::   rn_dmin     ! minimum floe diameter for lateral melting param.
+   !                      !!** namelist (namthd_da) **
+   REAL(wp) ::   rn_beta   ! coef. beta for lateral melting param.
+   REAL(wp) ::   rn_dmin   ! minimum floe diameter for lateral melting param.
 
    !!----------------------------------------------------------------------
@@ -118 +118 @@
       !
       zastar = 1._wp / ( 1._wp - (rn_dmin / zdmax)**(1._wp/rn_beta) )
+      !
       DO ji = 1, npti   
          ! --- Calculate reduction of total sea ice concentration --- !
@@ -157 +158 @@
    END SUBROUTINE ice_thd_da
 
+
    SUBROUTINE ice_thd_da_init
       !!-----------------------------------------------------------------------
@@ -169 +171 @@
       !! ** input   :   Namelist namthd_da
       !!-------------------------------------------------------------------
-      INTEGER  ::   ios   ! Local integer output status for namelist read
+      INTEGER  ::   ios   ! Local integer
       !!
       NAMELIST/namthd_da/ rn_beta, rn_dmin
@@ -176 +178 @@
       REWIND( numnam_ice_ref )              ! Namelist namthd_da in reference namelist : Ice thermodynamics
       READ  ( numnam_ice_ref, namthd_da, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namthd_da in reference namelist', lwp )
-
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namthd_da in reference namelist', lwp )
       REWIND( numnam_ice_cfg )              ! Namelist namthd_da in configuration namelist : Ice thermodynamics
       READ  ( numnam_ice_cfg, namthd_da, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namthd_da in configuration namelist', lwp )
-      IF(lwm) WRITE ( numoni, namthd_da )
-      !
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namthd_da in configuration namelist', lwp )
+      IF(lwm) WRITE( numoni, namthd_da )
       !
       IF(lwp) THEN                          ! control print
+         WRITE(numout,*)
          WRITE(numout,*) 'ice_thd_da_init: Ice lateral melting'
          WRITE(numout,*) '~~~~~~~~~~~~~~~'