Changeset 9169 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_sal.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/LIM_SRC_3/icethd_sal.F90 (modified) (8 diffs)

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

@@ -12 +12 @@
    !!   'key_lim3'                                       ESIM sea-ice model
    !!----------------------------------------------------------------------
-   !!   ice_thd_sal        : salinity variations in the ice
-   !!   ice_thd_sal_init   : initialization
+   !!   ice_thd_sal      : salinity variations in the ice
+   !!   ice_thd_sal_init : initialization
    !!----------------------------------------------------------------------
    USE dom_oce        ! ocean space and time domain
@@ -32 +32 @@
    
    ! ** namelist (namthd_sal) **
-   REAL(wp) ::   rn_sal_gd        ! restoring salinity for gravity drainage [PSU]
-   REAL(wp) ::   rn_time_gd       ! restoring time constant for gravity drainage (= 20 days) [s]
-   REAL(wp) ::   rn_sal_fl        ! restoring salinity for flushing [PSU]
-   REAL(wp) ::   rn_time_fl       ! restoring time constant for gravity drainage (= 10 days) [s]
+   REAL(wp) ::   rn_sal_gd     ! restoring salinity for gravity drainage [PSU]
+   REAL(wp) ::   rn_time_gd    ! restoring time constant for gravity drainage (= 20 days) [s]
+   REAL(wp) ::   rn_sal_fl     ! restoring salinity for flushing [PSU]
+   REAL(wp) ::   rn_time_fl    ! restoring time constant for gravity drainage (= 10 days) [s]
 
    !!----------------------------------------------------------------------
@@ -56 +56 @@
       !!---------------------------------------------------------------------
       LOGICAL, INTENT(in) ::   ld_sal            ! gravity drainage and flushing or not 
+      !
       INTEGER  ::   ji, jk                       ! dummy loop indices 
       REAL(wp) ::   iflush, igravdr              ! local scalars
@@ -66 +67 @@
       !               !---------------------------------------------!
       CASE( 2 )       !  time varying salinity with linear profile  !
-      !               !---------------------------------------------!
+         !            !---------------------------------------------!
          z1_time_gd = 1._wp / rn_time_gd * rdt_ice
          z1_time_fl = 1._wp / rn_time_fl * rdt_ice
          !
          DO ji = 1, npti
-
+            !
             !---------------------------------------------------------
             !  Update ice salinity from snow-ice and bottom growth
@@ -82 +83 @@
                s_i_1d(ji) = s_i_1d(ji) + zs_i_bg + zs_i_si
             ENDIF
-
+            !
             IF( ld_sal ) THEN
                !---------------------------------------------------------
@@ -100 +101 @@
             ENDIF
          END DO
-
+         !
          ! Salinity profile
          CALL ice_var_salprof1d
          !
-      !         !---------------------------------------------!
-      CASE( 3 ) ! constant salinity with a fixed profile      ! (Schwarzacher (1959) multiyear salinity profile(mean = 2.30)
-      !         !---------------------------------------------!
+         !             !----------------------------------------!
+      CASE( 3 )        ! constant salinity with a fixed profile ! (Schwarzacher (1959) multiyear salinity profile (mean = 2.30)
+         !             !----------------------------------------!
          CALL ice_var_salprof1d
+         !
+      END SELECT
       !
-   END SELECT
-   !
    END SUBROUTINE ice_thd_sal
 
@@ -125 +126 @@
       !! ** input   :   Namelist namthd_sal
       !!-------------------------------------------------------------------
-      INTEGER  ::   ios                 ! Local integer output status for namelist read
+      INTEGER  ::   ios   ! Local integer
       !!
       NAMELIST/namthd_sal/ nn_icesal, rn_icesal, rn_sal_gd, rn_time_gd,   &
@@ -133 +134 @@
       REWIND( numnam_ice_ref )              ! Namelist namthd_sal in reference namelist : Ice salinity
       READ  ( numnam_ice_ref, namthd_sal, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namthd_sal in reference namelist', lwp )
-      !
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namthd_sal in reference namelist', lwp )
       REWIND( numnam_ice_cfg )              ! Namelist namthd_sal in configuration namelist : Ice salinity
       READ  ( numnam_ice_cfg, namthd_sal, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namthd_sal in configuration namelist', lwp )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namthd_sal in configuration namelist', lwp )
       IF(lwm) WRITE ( numoni, namthd_sal )
       !