Changeset 14072 for NEMO/trunk/src/ICE/icestp.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/ICE/icestp.F90 (modified) (10 diffs)

NEMO/trunk/src/ICE/icestp.F90

@@ -8 +8 @@
    !!                        aka Sea Ice cube for its nickname
    !!
-   !!    is originally based on LIM3, developed in Louvain-la-Neuve by: 
+   !!    is originally based on LIM3, developed in Louvain-la-Neuve by:
    !!       * Martin Vancoppenolle (UCL-ASTR, Belgium)
    !!       * Sylvain Bouillon (UCL-ASTR, Belgium)
@@ -140 +140 @@
          IF( .NOT. Agrif_Root() )       nbstep_ice = MOD( nbstep_ice, Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) + 1
          !                              ! these calls must remain here for restartability purposes
-                                        CALL agrif_interp_ice( 'T' ) 
+                                        CALL agrif_interp_ice( 'T' )
                                         CALL agrif_interp_ice( 'U' )
                                         CALL agrif_interp_ice( 'V' )
@@ -152 +152 @@
          !    utau_ice, vtau_ice = surface ice stress [N/m2]
          !------------------------------------------------!
-                                        CALL ice_sbc_tau( kt, ksbc, utau_ice, vtau_ice )          
+                                        CALL ice_sbc_tau( kt, ksbc, utau_ice, vtau_ice )
          !-------------------------------------!
          ! --- ice dynamics and advection  --- !
          !-------------------------------------!
                                         CALL diag_set0                ! set diag of mass, heat and salt fluxes to 0
-                                        CALL ice_rst_opn( kt )        ! Open Ice restart file (if necessary) 
+                                        CALL ice_rst_opn( kt )        ! Open Ice restart file (if necessary)
          !
          IF( ln_icedyn .AND. .NOT.lk_c1d )   &
@@ -169 +169 @@
          !                          !==  previous lead fraction and ice volume for flux calculations
                                         CALL ice_var_glo2eqv          ! h_i and h_s for ice albedo calculation
-                                        CALL ice_var_agg(1)           ! at_i for coupling 
+                                        CALL ice_var_agg(1)           ! at_i for coupling
                                         CALL store_fields             ! Store now ice values
          !
@@ -189 +189 @@
          ! --- ice thermodynamics --- !
          !----------------------------!
-         IF( ln_icethd )                CALL ice_thd( kt )            ! -- Ice thermodynamics      
+         IF( ln_icethd )                CALL ice_thd( kt )            ! -- Ice thermodynamics
          !
                                         CALL diag_trends( 2 )         ! record thermo trends
@@ -197 +197 @@
                                         CALL ice_update_flx( kt )     ! -- Update ocean surface mass, heat and salt fluxes
          !
-         IF( ln_icediahsb )             CALL ice_dia( kt )            ! -- Diagnostics outputs 
-         !
-         IF( ln_icediachk )             CALL ice_drift_wri( kt )      ! -- Diagnostics outputs for conservation 
-         !
-                                        CALL ice_wri( kt )            ! -- Ice outputs 
-         !
-         IF( lrst_ice )                 CALL ice_rst_write( kt )      ! -- Ice restart file 
+         IF( ln_icediahsb )             CALL ice_dia( kt )            ! -- Diagnostics outputs
+         !
+         IF( ln_icediachk )             CALL ice_drift_wri( kt )      ! -- Diagnostics outputs for conservation
+         !
+                                        CALL ice_wri( kt )            ! -- Ice outputs
+         !
+         IF( lrst_ice )                 CALL ice_rst_write( kt )      ! -- Ice restart file
          !
          IF( ln_icectl )                CALL ice_ctl( kt )            ! -- Control checks
@@ -231 +231 @@
       !!----------------------------------------------------------------------
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'Sea Ice Model: SI3 (Sea Ice modelling Integrated Initiative)' 
+      IF(lwp) WRITE(numout,*) 'Sea Ice Model: SI3 (Sea Ice modelling Integrated Initiative)'
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~'
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'ice_init: Arrays allocation & Initialization of all routines & init state' 
+      IF(lwp) WRITE(numout,*) 'ice_init: Arrays allocation & Initialization of all routines & init state'
       IF(lwp) WRITE(numout,*) '~~~~~~~~'
       !
@@ -250 +250 @@
       !                                ! Allocate the ice arrays (sbc_ice already allocated in sbc_init)
       ierr =        ice_alloc        ()      ! ice variables
-      ierr = ierr + sbc_ice_alloc    ()      ! surface boundary conditions 
+      ierr = ierr + sbc_ice_alloc    ()      ! surface boundary conditions
       ierr = ierr + ice1D_alloc      ()      ! thermodynamics
       !
@@ -333 +333 @@
          WRITE(numout,*) '         Ice dynamics       (T) or not (F)                   ln_icedyn = ', ln_icedyn
          WRITE(numout,*) '         Ice thermodynamics (T) or not (F)                   ln_icethd = ', ln_icethd
-         WRITE(numout,*) '         maximum ice concentration for NH                              = ', rn_amax_n 
+         WRITE(numout,*) '         maximum ice concentration for NH                              = ', rn_amax_n
          WRITE(numout,*) '         maximum ice concentration for SH                              = ', rn_amax_s
       ENDIF
@@ -417 +417 @@
          wfx_bom(ji,jj) = 0._wp   ;   wfx_sum(ji,jj) = 0._wp
          wfx_res(ji,jj) = 0._wp   ;   wfx_sub(ji,jj) = 0._wp
-         wfx_spr(ji,jj) = 0._wp   ;   wfx_lam(ji,jj) = 0._wp  
+         wfx_spr(ji,jj) = 0._wp   ;   wfx_lam(ji,jj) = 0._wp
          wfx_snw_dyn(ji,jj) = 0._wp ; wfx_snw_sum(ji,jj) = 0._wp
          wfx_snw_sub(ji,jj) = 0._wp ; wfx_ice_sub(ji,jj) = 0._wp
-         wfx_snw_sni(ji,jj) = 0._wp 
+         wfx_snw_sni(ji,jj) = 0._wp
          wfx_pnd(ji,jj) = 0._wp