Ignore:
Timestamp:
2018-12-14T15:34:18+01:00 (23 months ago)
Author:
jcastill
Message:

Merged r6232_hadgem3_cplseq@7460 branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r10392 r10394  
    191191      ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) )  ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init) 
    192192#endif 
    193       ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
     193!      ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
     194      ! Hardwire three models as nn_cplmodel has not been read in from the namelist yet.    
     195      ALLOCATE( xcplmask(jpi,jpj,0:3) , STAT=ierr(3) ) 
    194196      ! 
    195197      sbc_cpl_alloc = MAXVAL( ierr ) 
     
    277279 
    278280      !                                   ! allocate sbccpl arrays 
    279       IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
     281      !IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
    280282      
    281283      ! ================================ ! 
Note: See TracChangeset for help on using the changeset viewer.