Changeset 13444


Ignore:
Timestamp:
2020-08-31T10:58:55+02:00 (8 months ago)
Author:
gsamson
Message:

move 'a_i_last_couple' variable declaration and allocation from ice.F90 to sbccpl.F90; delete cice specific declaration from sbc_ice.F90 and inialize 'info' variable to 'OASIS_idle' in sbc_cpl_snd routine (sbccpl.F90); see ticket #2514

Location:
NEMO/releases/r4.0/r4.0-HEAD/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/releases/r4.0/r4.0-HEAD/src/ICE/ice.F90

    r13346 r13444  
    412412   ! 
    413413   !!---------------------------------------------------------------------- 
    414    !! * Only for atmospheric coupling 
    415    !!---------------------------------------------------------------------- 
    416    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   a_i_last_couple !: Ice fractional area at last coupling time 
    417    ! 
    418    !!---------------------------------------------------------------------- 
    419414   !! NEMO/ICE 4.0 , NEMO Consortium (2018) 
    420415   !! $Id$ 
     
    429424      INTEGER :: ice_alloc 
    430425      ! 
    431       INTEGER :: ierr(17), ii 
     426      INTEGER :: ierr(16), ii 
    432427      !!----------------------------------------------------------------- 
    433428      ierr(:) = 0 
     
    511506      ALLOCATE( t_si(jpi,jpj,jpl) , tm_si(jpi,jpj) , qcn_ice_bot(jpi,jpj,jpl) , qcn_ice_top(jpi,jpj,jpl) , STAT = ierr(ii) ) 
    512507 
    513       ! * For atmospheric coupling 
    514       ii = ii + 1 
    515       ALLOCATE( a_i_last_couple(jpi,jpj,jpl) , STAT=ierr(ii) ) 
    516  
    517508      ice_alloc = MAXVAL( ierr(:) ) 
    518509      IF( ice_alloc /= 0 )   CALL ctl_stop( 'STOP', 'ice_alloc: failed to allocate arrays.' ) 
  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbc_ice.F90

    r13284 r13444  
    9595   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  a_i 
    9696   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  h_i, h_s 
    97    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  a_i_last_couple   !: Sea ice fraction on categories at the last coupling point 
    9897 
    9998   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   tatm_ice       !: air temperature [K] 
  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbccpl.F90

    r13284 r13444  
    205205 
    206206   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   alb_oce_mix    ! ocean albedo sent to atmosphere (mix clear/overcast sky) 
     207#if defined key_si3 || defined key_cice 
     208   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   a_i_last_couple !: Ice fractional area at last coupling time 
     209#endif 
    207210 
    208211   REAL(wp) ::   rpref = 101000._wp   ! reference atmospheric pressure[N/m2]  
     
    224227      !!             ***  FUNCTION sbc_cpl_alloc  *** 
    225228      !!---------------------------------------------------------------------- 
    226       INTEGER :: ierr(4) 
     229      INTEGER :: ierr(5) 
    227230      !!---------------------------------------------------------------------- 
    228231      ierr(:) = 0 
     
    234237#endif 
    235238      ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
    236       ! 
    237       IF( .NOT. ln_apr_dyn ) ALLOCATE( ssh_ib(jpi,jpj), ssh_ibb(jpi,jpj), apr(jpi, jpj), STAT=ierr(4) )  
     239#if defined key_si3 || defined key_cice 
     240      ALLOCATE( a_i_last_couple(jpi,jpj,jpl) , STAT=ierr(4) ) 
     241#endif 
     242      ! 
     243      IF( .NOT. ln_apr_dyn ) ALLOCATE( ssh_ib(jpi,jpj), ssh_ibb(jpi,jpj), apr(jpi, jpj), STAT=ierr(5) ) 
    238244 
    239245      sbc_cpl_alloc = MAXVAL( ierr ) 
     
    21832189      ! 
    21842190      isec = ( kt - nit000 ) * NINT( rdt )        ! date of exchanges 
     2191      info = OASIS_idle 
    21852192 
    21862193      zfr_l(:,:) = 1.- fr_i(:,:) 
Note: See TracChangeset for help on using the changeset viewer.