Changeset 7060 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2016-10-20T16:16:29+02:00 (8 years ago)

Author:

clem

Message:

update agrif+lim3

File:

• branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (4 diffs)

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -118 +118 @@
       IF( nn_timing == 1 )  CALL timing_start('sbc_ice_lim')
 
+      ! clem: it is important to initialize agrif_lim3 variables here and not in sbc_lim_init
+# if defined key_agrif
+      IF( kt == nit000 ) THEN
+         IF( .NOT. Agrif_Root() )   CALL Agrif_InitValues_cont_lim3
+      ENDIF
+# endif
+
       !-----------------------!
       ! --- Ice time step --- !
@@ -189 +196 @@
             !
          ENDIF
+
          ! ---
 #if defined key_agrif
@@ -314 +322 @@
       IF( ierr /= 0 )   CALL ctl_stop('STOP', 'sbc_lim_init : unable to allocate ice arrays')
       !
-      !                                ! adequation jpk versus ice/snow layers/categories
-      IF( jpl > jpk .OR. (nlay_i+1) > jpk .OR. nlay_s > jpk )   &
-         &      CALL ctl_stop( 'STOP',                          &
-         &     'sbc_lim_init: the 3rd dimension of workspace arrays is too small.',   &
-         &     'use more ocean levels or less ice/snow layers/categories.' )
-      !
       CALL lim_dyn_init                ! set ice dynamics parameters
       !
@@ -364 +366 @@
       IF( nstock == 0 )   nstock = nlast + 1
       !
-# if defined key_agrif
-      IF( .NOT. Agrif_Root() )   CALL Agrif_InitValues_cont_lim3
-# endif
       !
    END SUBROUTINE sbc_lim_init