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 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/ICB/icbini.F90 – NEMO

Ignore:
Timestamp:
2021-11-28T18:59:49+01:00 (3 years ago)
Author:
gsamson
Message:

update branch to the head of the trunk (r15547); ticket #2632

Location:
NEMO/branches/2021/ticket2632_r14588_theta_sbcblk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

    • Property svn:externals

      •  

        old new  
        99 
        1010# SETTE 
        11 ^/utils/CI/sette@14244        sette 
         11^/utils/CI/sette@HEAD        sette 
         12 

  • NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/ICB/icbini.F90

    r14433 r15548  
    7474      IF( .NOT. ln_icebergs )   RETURN 
    7575      ! 
     76      ALLOCATE( utau_icb(jpi,jpj), vtau_icb(jpi,jpj) ) 
     77      ! 
    7678      !                          ! allocate gridded fields 
    7779      IF( icb_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'icb_alloc : unable to allocate arrays' ) 
    … …  
    182184      i3 = INT( src_calving(i1,jpj/2) ) 
    183185      jj = INT( i3/nicbpack ) 
    184       ricb_left = REAL( i3 - nicbpack*jj, wp ) 
     186      ricb_left = REAL( i3 - nicbpack*jj, wp ) - (nn_hls-1) 
    185187      i1 = MIN( nicbei+1, jpi ) 
    186188      i3 = INT( src_calving(i1,jpj/2) ) 
    187189      jj = INT( i3/nicbpack ) 
    188       ricb_right = REAL( i3 - nicbpack*jj, wp ) 
     190      ricb_right = REAL( i3 - nicbpack*jj, wp ) - (nn_hls-1) 
    189191       
    190192      ! north fold 
    … …  
    360362                rn_test_box(3) < gphit(ji,jj) .AND. gphit(ji,jj) < rn_test_box(4) ) THEN 
    361363               localberg%mass_scaling = rn_mass_scaling(iberg) 
    362                localpt%xi = REAL( mig(ji), wp ) 
    363                localpt%yj = REAL( mjg(jj), wp ) 
     364               localpt%xi = REAL( mig(ji) - (nn_hls-1), wp ) 
     365               localpt%yj = REAL( mjg(jj) - (nn_hls-1), wp ) 
    364366               CALL icb_utl_interp( localpt%xi, localpt%yj, plat=localpt%lat, plon=localpt%lon )    
    365367               localpt%mass      = rn_initial_mass     (iberg) 
Note: See TracChangeset for help on using the changeset viewer.