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

Timestamp:

2017-09-05T19:53:41+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part2 -

File:

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

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

@@ -122 +122 @@
          !                                   !-----------------------!
          !
-         kt_ice = kt       ! Ice model time step
+         kt_ice = kt                              ! -- Ice model time step
          !
 # if defined key_agrif
          IF( .NOT. Agrif_Root() )  lim_nbstep = MOD( lim_nbstep, Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) + 1
 # endif
-
-         !                 ! mean surface ocean current at ice velocity point
-         u_oce(:,:) = ssu_m(:,:) * umask(:,:,1)
-         v_oce(:,:) = ssv_m(:,:) * vmask(:,:,1)
-!!gm the umask, vmask above is useless as ssu_m, ssv_m are build from masked un,vn (used t be here for B-grid sea-ice)
-
-         !                 ! masked sea surface freezing temperature [Kelvin] (set to rt0 over land)
-         CALL eos_fzp( sss_m(:,:) , t_bo(:,:) )
+         u_oce(:,:) = ssu_m(:,:)                  ! -- mean surface ocean current
+         v_oce(:,:) = ssv_m(:,:)
+         !
+         CALL eos_fzp( sss_m(:,:) , t_bo(:,:) )   ! -- freezing temperature [Kelvin] (set to rt0 over land)
          t_bo(:,:) = ( t_bo(:,:) + rt0 ) * tmask(:,:,1) + rt0 * ( 1._wp - tmask(:,:,1) )
          !
-         CALL ice_bef      ! Store previous ice values
+         CALL store_fields                        ! -- Store now ice values
          !
          !------------------------------------------------!
@@ -179 +175 @@
          CALL ice_var_glo2eqv            ! ht_i and ht_s for ice albedo calculation
          CALL ice_var_agg(1)             ! at_i for coupling 
-         CALL ice_bef                    ! Store previous ice values
+         CALL store_fields               ! Store now ice values
 
          !------------------------------------------------------!
@@ -223 +219 @@
 !!         IF( .NOT. Agrif_Root() )   CALL Agrif_ParentGrid_To_ChildGrid()
 !!# endif
-         IF( ln_limdiahsb )           CALL ice_dia( kt )        ! -- Diagnostics and outputs 
-         !
-                                      CALL ice_wri( 1 )         ! -- Ice outputs 
+         IF( ln_limdiahsb )         CALL ice_dia( kt )        ! -- Diagnostics and outputs 
+         !
+                                    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 
-         !
-         IF( ln_limctl )              CALL ice_ctl( kt )        ! alerts in case of model crash
+            &                       CALL iom_close( numrir )  ! close input ice restart file
+         !
+         IF( lrst_ice )             CALL ice_rst_write( kt )  ! -- Ice restart file 
+         !
+         IF( ln_limctl )            CALL ice_ctl( kt )        ! alerts in case of model crash
          !
       ENDIF   ! End sea-ice time step only
@@ -241 +237 @@
       ! Update surface ocean stresses (only in ice-dynamic case) otherwise the atm.-ocean stresses are used everywhere
       !    using before instantaneous surf. currents
-      IF( ln_limdyn )                 CALL ice_update_tau( kt, ub(:,:,1), vb(:,:,1) )
+      IF( ln_limdyn )               CALL ice_update_tau( kt, ub(:,:,1), vb(:,:,1) )
 !!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!!
       !
@@ -476 +472 @@
 
 
-   SUBROUTINE ice_bef
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE ice_bef  ***
+   SUBROUTINE store_fields
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE store_fields  ***
       !!
       !! ** purpose :  store ice variables at "before" time step
@@ -525 +521 @@
       CALL lbc_lnk_multi( at_i_b, 'T', 1., u_ice_b , 'U', -1., v_ice_b , 'V', -1. )
       !
-   END SUBROUTINE ice_bef
+   END SUBROUTINE store_fields
 
 
@@ -570 +566 @@
             !
             afx_tot(ji,jj) = 0._wp   ;
-            afx_dyn(ji,jj) = 0._wp   ;   afx_thd(ji,jj) = 0._wp
             !
             diag_heat(ji,jj) = 0._wp ;   diag_smvi(ji,jj) = 0._wp