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

Timestamp:

2017-09-25T21:11:19+02:00 (7 years ago)

Author:

clem

Message:

cosmetics only

File:

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

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

@@ -128 +128 @@
          !    utau_ice, vtau_ice = surface ice stress [N/m2]
          !------------------------------------------------!
-         CALL ice_forcing_tau( kt, ksbc, utau_ice, vtau_ice )
-                                      
+                                        CALL ice_forcing_tau( kt, ksbc, utau_ice, vtau_ice )          
          !-------------------------------------!
          ! --- ice dynamics and advection  --- !
@@ -136 +135 @@
          CALL ice_rst_opn( kt )     ! Open Ice restart file (if necessary) 
          !
-         IF( ln_icedyn .AND. .NOT.lk_c1d )   CALL ice_dyn( kt )            ! -- Ice dynamics
+         IF( ln_icedyn .AND. .NOT.lk_c1d )   &
+            &                           CALL ice_dyn( kt )            ! -- Ice dynamics
          !
          !                          !==  lateral boundary conditions  ==!
 #if defined key_agrif
-         IF( .NOT. Agrif_Root()     )        CALL agrif_interp_lim3('T')   ! -- AGRIF 
+         IF( .NOT. Agrif_Root()     )   CALL agrif_interp_lim3('T')   ! -- AGRIF 
 #endif
-         IF( ln_icethd .AND. ln_bdy )        CALL bdy_ice( kt )            ! -- bdy ice thermo
+         IF( ln_icethd .AND. ln_bdy )   CALL bdy_ice( kt )            ! -- bdy ice thermo
          !
          !
          !                          !==  previous lead fraction and ice volume for flux calculations
-         !
          CALL ice_var_glo2eqv            ! ht_i and ht_s for ice albedo calculation
          CALL ice_var_agg(1)             ! at_i for coupling 
@@ -165 +164 @@
          !    qprec_ice, qevap_ice
          !------------------------------------------------------!
-                                    CALL ice_forcing_flx( kt, ksbc )
-
+                                        CALL ice_forcing_flx( kt, ksbc )
          !----------------------------!
          ! --- ice thermodynamics --- !
          !----------------------------!
-         IF( ln_icethd )            CALL ice_thd( kt )          ! -- Ice thermodynamics      
-
-         ! MV MP 2016
-         IF ( ln_pnd )              CALL lim_mp( kt )           ! -- Melt ponds
-         ! END MV MP 2016
-
-         IF( ln_icethd )            CALL ice_cor( kt , 2 )      ! -- Corrections
-         ! ---
+         IF( ln_icethd )                CALL ice_thd( kt )            ! -- Ice thermodynamics      
+         !
+         IF ( ln_pnd )                  CALL lim_mp( kt )             ! -- Melt ponds
+         !
+         IF( ln_icethd )                CALL ice_cor( kt , 2 )        ! -- Corrections
 # if defined key_agrif
-         IF( .NOT. Agrif_Root() )   CALL agrif_update_lim3( kt )
+         IF( .NOT. Agrif_Root() )       CALL agrif_update_lim3( kt )
 # endif
-                                    CALL ice_var_glo2eqv        ! necessary calls (at least for coupling)
-                                    CALL ice_var_agg( 2 )       ! necessary calls (at least for coupling)
-                                    !
+         CALL ice_var_glo2eqv        ! necessary calls (at least for coupling)
+         CALL ice_var_agg( 2 )       ! necessary calls (at least for coupling)
+                                     !
 !! clem: one should switch the calculation of the fluxes onto the parent grid but the following calls do not work
 !!       moreover it should only be called at the update frequency (as in agrif_lim3_update.F90)
 !!# if defined key_agrif
-!!         IF( .NOT. Agrif_Root() )   CALL Agrif_ChildGrid_To_ParentGrid()
+!!         IF( .NOT. Agrif_Root() )     CALL Agrif_ChildGrid_To_ParentGrid()
 !!# endif
-                                    CALL ice_update_flx( kt )   ! -- Update ocean surface mass, heat and salt fluxes
+                                        CALL ice_update_flx( kt )     ! -- Update ocean surface mass, heat and salt fluxes
 !!# if defined key_agrif
-!!         IF( .NOT. Agrif_Root() )   CALL Agrif_ParentGrid_To_ChildGrid()
+!!         IF( .NOT. Agrif_Root() )     CALL Agrif_ParentGrid_To_ChildGrid()
 !!# endif
-         IF( ln_icediahsb )         CALL ice_dia( kt )          ! -- Diagnostics and outputs 
-         !
-                                    CALL ice_wri( 1 )           ! -- Ice outputs 
-         !
-         !
-         IF( lrst_ice )             CALL ice_rst_write( kt )    ! -- Ice restart file 
-         !
-         IF( ln_icectl )            CALL ice_ctl( kt )          ! -- alerts in case of model crash
+         IF( ln_icediahsb )             CALL ice_dia( kt )            ! -- Diagnostics outputs 
+         !
+                                        CALL ice_wri( kt )            ! -- Ice outputs 
+         !
+         IF( lrst_ice )                 CALL ice_rst_write( kt )      ! -- Ice restart file 
+         !
+         IF( ln_icectl )                CALL ice_ctl( kt )            ! -- alerts in case of model crash
          !
       ENDIF   ! End sea-ice time step only
@@ -207 +201 @@
       ! --- Ocean time step --- !
       !-------------------------!
-      ! Update surface ocean stresses (only in ice-dynamic case) otherwise the atm.-ocean stresses are used everywhere
-      !    using before instantaneous surf. currents
-      IF( ln_icedyn )               CALL ice_update_tau( kt, ub(:,:,1), vb(:,:,1) )
+      IF( ln_icedyn )                   CALL ice_update_tau( kt, ub(:,:,1), vb(:,:,1) )   ! -- update surface ocean stresses
 !!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!!
       !
-      IF( nn_timing == 1 ) CALL timing_stop('ice_stp')
+      IF( nn_timing == 1 )   CALL timing_stop('ice_stp')
       !
    END SUBROUTINE ice_stp
@@ -246 +238 @@
       CALL ice_itd_init                ! ice thickness distribution initialization
       !
-      ! MV MP 2016
       CALL lim_mp_init                 ! set melt ponds parameters (clem: important to be located here)
-      ! END MV MP 2016
+      !
       !                                ! Initial sea-ice state
       IF( .NOT. ln_rstart ) THEN              ! start from rest: sea-ice deduced from sst