Changeset 8518 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

Timestamp:

2017-09-13T18:46:56+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part6 - commits of the day

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) (6 diffs)

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

@@ -206 +206 @@
                                     CALL ice_wri( 1 )         ! -- Ice outputs 
          !
-         IF( kt == nit000 .AND. ln_rstart )   &                !!gm  I don't understand the ln_rstart, if needed, add a comment, please
-            &                       CALL iom_close( numrir )  ! close input ice restart file
          !
          IF( lrst_ice )             CALL ice_rst_write( kt )  ! -- Ice restart file 
@@ -251 +249 @@
       ierr = ierr + sbc_ice_alloc    ()      ! surface forcing 
       ierr = ierr + ice1D_alloc      ()      ! thermodynamics
-      ierr = ierr + ice_rdgrft_alloc ()      ! ridging/rafting
       !
       IF( lk_mpp    )   CALL mpp_sum( ierr )
@@ -258 +255 @@
       CALL ice_itd_init                ! ice thickness distribution initialization
       !
-      IF( ln_icedyn )   THEN
-         CALL ice_dyn_init             ! set ice dynamics parameters
-         CALL ice_rdgrft_init          ! set ice ridging/rafting parameters
-         CALL ice_rhg_init             ! set ice rheology parameters
-         CALL ice_adv_init             ! set ice advection parameters
-      ENDIF
-
-      IF( ln_icethd ) THEN
-         CALL ice_thd_init             ! set ice thermodynics parameters
-         CALL ice_thd_sal_init         ! set ice salinity parameters
-      ENDIF
-   
       ! MV MP 2016
-      CALL lim_mp_init                 ! set melt ponds parameters
+      CALL lim_mp_init                 ! set melt ponds parameters (clem: important to be located here)
       ! END MV MP 2016
       !                                ! Initial sea-ice state
@@ -283 +268 @@
       CALL ice_var_glo2eqv
       !
+      IF( ln_icedyn ) THEN
+         CALL ice_dyn_init             ! set ice dynamics parameters
+         CALL ice_rdgrft_init          ! set ice ridging/rafting parameters
+         CALL ice_rhg_init             ! set ice rheology parameters
+         CALL ice_adv_init             ! set ice advection parameters
+      ENDIF
+
+      IF( ln_icethd ) THEN
+         CALL ice_thd_init             ! set ice thermodynics parameters
+         CALL ice_thd_sal_init         ! set ice salinity parameters
+      ENDIF   
+      !
       CALL ice_update_init             ! ice surface boundary condition
       !
@@ -296 +293 @@
       ELSEWHERE                     ;   rn_amax_2d(:,:) = rn_amax_s  ! SH
       END WHERE
+
+      IF( ln_rstart )   CALL iom_close( numrir )  ! close input ice restart file
       !
    END SUBROUTINE ice_init
@@ -429 +428 @@
       hfx_res(:,:) = 0._wp   ;   hfx_sub(:,:) = 0._wp
       hfx_spr(:,:) = 0._wp   ;   hfx_dif(:,:) = 0._wp
-      hfx_err(:,:) = 0._wp   ;   hfx_err_rem(:,:) = 0._wp
+      hfx_err_rem(:,:) = 0._wp
       hfx_err_dif(:,:) = 0._wp
       wfx_err_sub(:,:) = 0._wp