Changeset 8486 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90

Timestamp:

2017-09-01T15:49:35+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part1 - (now the code looks better txs to Gurvan's comments)

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (modified) (11 diffs)

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

@@ -12 +12 @@
 #if defined key_lim3
    !!----------------------------------------------------------------------
-   !!   'key_lim3'                                      LIM3 sea-ice model
+   !!   'key_lim3'                                       LIM3 sea-ice model
    !!----------------------------------------------------------------------
    !!   ice_thd_dh    : vertical accr./abl. and lateral ablation of sea ice
@@ -36 +36 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/LIM3 4.0 , UCL - NEMO Consortium (2010)
+   !! NEMO/ICE 4.0 , NEMO Consortium (2017)
    !! $Id: icethd_dh.F90 8420 2017-08-08 12:18:46Z clem $
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -66 +66 @@
       !!              Vancoppenolle et al.,2009, Ocean Modelling
       !!------------------------------------------------------------------
-      INTEGER  ::   ji , jk        ! dummy loop indices
-      INTEGER  ::   iter
-
-      REAL(wp) ::   ztmelts             ! local scalar
+      INTEGER  ::   ji, jk       ! dummy loop indices
+      INTEGER  ::   iter         ! local integer
+
+      REAL(wp) ::   ztmelts      ! local scalar
       REAL(wp) ::   zdum       
       REAL(wp) ::   zfracs       ! fractionation coefficient for bottom salt entrapment
@@ -104 +104 @@
       REAL(wp) :: zswitch_sal
 
-      ! Heat conservation 
-      INTEGER  ::   num_iter_max
+      INTEGER  ::   num_iter_max      ! Heat conservation 
       !!------------------------------------------------------------------
 
       ! Discriminate between varying salinity (nn_icesal=2) and prescribed cases (other values)
       SELECT CASE( nn_icesal )                  ! varying salinity or not
-         CASE( 1, 3 ) ;   zswitch_sal = 0._wp   ! prescribed salinity profile
-         CASE( 2 )    ;   zswitch_sal = 1._wp   ! varying salinity profile
+         CASE( 1, 3 )   ;   zswitch_sal = 0._wp   ! prescribed salinity profile
+         CASE( 2 )      ;   zswitch_sal = 1._wp   ! varying salinity profile
       END SELECT
 
@@ -127 +126 @@
             h_i_old (ji,jk) = ht_i_1d(ji) * r1_nlay_i
             eh_i_old(ji,jk) = e_i_1d(ji,jk) * h_i_old(ji,jk)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
       !
       !------------------------------------------------------------------------------!
@@ -142 +141 @@
       END DO
 
-      !
       !------------------------------------------------------------------------------!
       ! If snow temperature is above freezing point, then snow melts 
@@ -163 +161 @@
       !  2) Computing layer thicknesses and enthalpies.            !
       !------------------------------------------------------------!
-      !
       DO jk = 1, nlay_i
          DO ji = 1, nidx
@@ -170 +167 @@
          END DO
       END DO
-      !
+
       !------------------------------------------------------------------------------|
       !  3) Surface ablation and sublimation                                         |
@@ -389 +386 @@
       END DO
 
-      !
+
       !------------------------------------------------------------------------------!
       ! 4) Basal growth / melt                                                       !
@@ -664 +661 @@
    !! ** Purpose :   Compute distribution of precip over the ice
    !!--------------------------------------------------------------------------
+!!gm  I think it can be usefull to set this as a FUNCTION, not a SUBROUTINE....
    SUBROUTINE ice_thd_snwblow_2d( pin, pout )
       REAL(wp), DIMENSION(:,:), INTENT(in   ) :: pin   ! previous fraction lead ( 1. - a_i_b )
@@ -676 +674 @@
    END SUBROUTINE ice_thd_snwblow_1d
 
-   
 #else
    !!----------------------------------------------------------------------
    !!   Default option                               NO  LIM3 sea-ice model
    !!----------------------------------------------------------------------
-CONTAINS
-   SUBROUTINE ice_thd_dh          ! Empty routine
-   END SUBROUTINE ice_thd_dh
 #endif