Changeset 7060 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC

Timestamp:

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

Author:

clem

Message:

update agrif+lim3

Location:

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbcice_lim.F90 (modified) (4 diffs)
• sbcmod.F90 (modified) (3 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

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

@@ -111 +111 @@
 
       !                          ! overwrite namelist parameter using CPP key information
-      IF( Agrif_Root() ) THEN                ! AGRIF zoom
-        IF( lk_lim2 )   nn_ice      = 2
-        IF( lk_lim3 )   nn_ice      = 3
-        IF( lk_cice )   nn_ice      = 4
-      ENDIF
-      IF( cp_cfg == 'gyre' ) THEN            ! GYRE configuration
-          ln_ana      = .TRUE.   
-          nn_ice      =   0
-      ENDIF
-
+#if defined key_agrif
+      IF( Agrif_Root() ) THEN                ! AGRIF zoom (cf r1242: possibility to run without ice in fine grid)
+         IF( lk_lim2 )   nn_ice      = 2
+         IF( lk_lim3 )   nn_ice      = 3
+         IF( lk_cice )   nn_ice      = 4
+      ENDIF
+#else
+      IF( lk_lim2 )   nn_ice      = 2
+      IF( lk_lim3 )   nn_ice      = 3
+      IF( lk_cice )   nn_ice      = 4     
+#endif
+
+      IF( cp_cfg == 'gyre' )   ln_ana = .TRUE.          ! GYRE configuration
+             
       IF(lwp) THEN               ! Control print
          WRITE(numout,*) '        Namelist namsbc (partly overwritten with CPP key setting)'
@@ -195 +199 @@
 
       !                                            ! restartability   
-      IF( ( nn_ice == 2 .OR. nn_ice ==3 ) .AND. .NOT.( ln_blk_clio .OR. ln_blk_core .OR. ln_cpl ) )   &
-         &   CALL ctl_stop( 'LIM sea-ice model requires a bulk formulation or coupled configuration' )
       IF( nn_ice == 4 .AND. .NOT.( ln_blk_core .OR. ln_cpl ) )   &
          &   CALL ctl_stop( 'CICE sea-ice model requires ln_blk_core or ln_cpl' )
@@ -303 +305 @@
       !
       IF( nn_ice == 3      )   CALL sbc_lim_init               ! LIM3 initialisation
-
+      !
       IF( nn_ice == 4      )   CALL cice_sbc_init( nsbc )      ! CICE initialisation