Changeset 12988 for NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icestp.F90

Timestamp:

2020-05-28T16:21:45+02:00 (4 years ago)

Author:

clem

Message:

deal with possible out of bounds ice concentration at initial time step and remove unecessary initialization of before values

File:

• NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icestp.F90 (modified) (5 diffs)

NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icestp.F90

@@ -202 +202 @@
          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_icectl )                CALL ice_ctl( kt )            ! -- Control checks
          !
       ENDIF   ! End sea-ice time step only
@@ -223 +223 @@
       !! ** purpose :   Initialize sea-ice parameters
       !!----------------------------------------------------------------------
-      INTEGER :: ji, jj, ierr
+      INTEGER :: jl, ierr
       !!----------------------------------------------------------------------
       IF(lwp) WRITE(numout,*)
@@ -247 +247 @@
       IF( ierr /= 0 )   CALL ctl_stop('STOP', 'ice_init : unable to allocate ice arrays')
       !
+      !                                ! set max concentration in both hemispheres
+      WHERE( gphit(:,:) > 0._wp )   ;   rn_amax_2d(:,:) = rn_amax_n  ! NH
+      ELSEWHERE                     ;   rn_amax_2d(:,:) = rn_amax_s  ! SH
+      END WHERE
+      !
       CALL ice_itd_init                ! ice thickness distribution initialization
       !
@@ -252 +257 @@
       !
       !                                ! Initial sea-ice state
-
       IF ( ln_rstart .OR. nn_iceini_file == 2 ) THEN
          CALL ice_rst_read                      ! start from a restart file
       ELSE
          CALL ice_istate_init
-         CALL ice_istate( nit000 )              ! start from rest: sea-ice deduced from sst
+         CALL ice_istate( nit000 )              ! start from rest or read a file
       ENDIF
       CALL ice_var_glo2eqv
@@ -275 +279 @@
       tn_ice(:,:,:) = t_su(:,:,:)      ! initialisation of surface temp for coupled simu
       !
-      !                                ! set max concentration in both hemispheres
-      WHERE( gphit(:,:) > 0._wp )   ;   rn_amax_2d(:,:) = rn_amax_n  ! NH
-      ELSEWHERE                     ;   rn_amax_2d(:,:) = rn_amax_s  ! SH
-      END WHERE
-
       IF( ln_rstart )   CALL iom_close( numrir )  ! close input ice restart file
       !