Changeset 8512 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90

Timestamp:

2017-09-07T20:08:11+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part5 - reaching the end

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90 (modified) (8 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceitd.F90

@@ -38 +38 @@
    PUBLIC   ice_itd_reb   ! called in iceerr
 
-   ! ** ice-thickness distribution namelist (namiceitd) **
+   ! ** ice-thickness distribution namelist (namice_itd) **
    REAL(wp) ::   rn_himean        ! mean thickness of the domain (used to compute the distribution)
 
@@ -79 +79 @@
       !!------------------------------------------------------------------
 
-      IF( kt == nit000 .AND. lwp) THEN
-         WRITE(numout,*)
-         WRITE(numout,*) 'ice_itd_rem  : Remapping the ice thickness distribution'
-         WRITE(numout,*) '~~~~~~~~~~~~~~~'
-      ENDIF
+      IF( kt == nit000 .AND. lwp )   WRITE(numout,*) '-- ice_itd_rem: remapping ice thickness distribution' 
 
       IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'iceitd_rem', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
@@ -545 +541 @@
    
 
-   SUBROUTINE ice_itd_reb
+   SUBROUTINE ice_itd_reb( kt )
       !!------------------------------------------------------------------
       !!                ***  ROUTINE ice_itd_reb ***
@@ -555 +551 @@
       !!              to the neighboring category
       !!------------------------------------------------------------------
+      INTEGER , INTENT (in) ::   kt      ! Ocean time step 
       INTEGER ::   ji, jj, jl   ! dummy loop indices
       !
@@ -561 +558 @@
       !!------------------------------------------------------------------
       !
+      IF( kt == nit000 .AND. lwp )   WRITE(numout,*) '-- ice_itd_reb: rebining ice thickness distribution' 
+
       jdonor(:,:) = 0
       zdaice(:,:) = 0._wp
@@ -645 +644 @@
       !! ** Purpose :   Initializes the ice thickness distribution
       !! ** Method  :   ...
-      !! ** input   :   Namelist namiceitd
+      !! ** input   :   Namelist namice_itd
       !!-------------------------------------------------------------------
       INTEGER  ::   jl    ! dummy loop index
@@ -651 +650 @@
       REAL(wp) ::   zhmax, znum, zden, zalpha   !   -      -
       !!
-      NAMELIST/namiceitd/ rn_himean
-      !!------------------------------------------------------------------
-      !
-      REWIND( numnam_ice_ref )      ! Namelist namiceitd in reference namelist : Parameters for ice
-      READ  ( numnam_ice_ref, namiceitd, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceitd in reference namelist', lwp )
-
-      REWIND( numnam_ice_cfg )      ! Namelist namiceitd in configuration namelist : Parameters for ice
-      READ  ( numnam_ice_cfg, namiceitd, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceitd in configuration namelist', lwp )
-      IF(lwm) WRITE ( numoni, namiceitd )
+      NAMELIST/namice_itd/ rn_himean
+      !!------------------------------------------------------------------
+      !
+      REWIND( numnam_ice_ref )      ! Namelist namice_itd in reference namelist : Parameters for ice
+      READ  ( numnam_ice_ref, namice_itd, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_itd in reference namelist', lwp )
+
+      REWIND( numnam_ice_cfg )      ! Namelist namice_itd in configuration namelist : Parameters for ice
+      READ  ( numnam_ice_cfg, namice_itd, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_itd in configuration namelist', lwp )
+      IF(lwm) WRITE ( numoni, namice_itd )
       !
       IF(lwp) THEN                  ! control print
@@ -667 +666 @@
          WRITE(numout,*) 'ice_itd_init : Initialization of ice cat distribution '
          WRITE(numout,*) '~~~~~~~~~~~~'
-         WRITE(numout,*) '   Namelist namicerun : '
+         WRITE(numout,*) '   Namelist namice_itd : '
          WRITE(numout,*) '      mean ice thickness in the domain               rn_himean = ', rn_himean
       ENDIF