New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 8331 for branches/2017 – NEMO

Changeset 8331 for branches/2017


Ignore:
Timestamp:
2017-07-13T19:17:41+02:00 (7 years ago)
Author:
clem
Message:

correct a bug introduced at r8324

Location:
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

    r8324 r8331  
    304304      !                                ! Allocate the ice arrays (sbc_ice already allocated in sbc_init) 
    305305      ierr =        ice_alloc        ()      ! ice variables 
     306      ierr = ierr + sbc_ice_alloc    ()      ! surface forcing  
    306307      ierr = ierr + thd_ice_alloc    ()      ! thermodynamics 
    307308      IF( ln_limdyn )   ierr = ierr + lim_itd_me_alloc ()      ! ice thickness distribution - mechanics 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r8324 r8331  
    199199 
    200200! allocate sbc_ice and sbc_cice arrays 
     201      IF( sbc_ice_alloc()      /= 0 )   CALL ctl_stop( 'STOP', 'sbc_ice_cice_alloc : unable to allocate arrays' ) 
    201202      IF( sbc_ice_cice_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_ice_cice_alloc : unable to allocate cice arrays' ) 
    202203 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r8324 r8331  
    210210      !                             !* allocate sbc arrays 
    211211      IF( sbc_oce_alloc() /= 0 )   CALL ctl_stop( 'sbc_init : unable to allocate sbc_oce arrays' ) 
    212       IF( sbc_ice_alloc() /= 0 )   CALL ctl_stop( 'sbc_init : unable to allocate sbc_ice arrays' )               
     212#if ! defined key_lim3 && ! defined key_cice 
     213      IF( sbc_ice_alloc() /= 0 )   CALL ctl_stop( 'sbc_init : unable to allocate sbc_ice arrays' ) 
     214#endif 
    213215      ! 
    214216      IF( .NOT.ln_isf ) THEN        !* No ice-shelf in the domain : allocate and set to zero 
     
    307309      ! 
    308310#if defined key_lim3 
    309       IF( nn_ice == 2 )   CALL ice_init                ! LIM3 initialization 
     311           IF    ( lk_agrif .AND. nn_ice == 0 ) THEN 
     312                          IF( sbc_ice_alloc() /= 0 )   CALL ctl_stop('STOP', 'sbc_ice_alloc : unable to allocate arrays' )  ! clem2017: allocate ice arrays in case agrif + lim + no-ice in child grid 
     313           ELSEIF( nn_ice == 2 ) THEN 
     314                          CALL ice_init                ! LIM3 initialization 
     315           ENDIF 
    310316#endif 
    311317      IF( nn_ice == 3 )   CALL cice_sbc_init( nsbc )   ! CICE initialization 
Note: See TracChangeset for help on using the changeset viewer.