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/sbcmod.F90

    r8058 r10394  
    266266      ENDIF 
    267267      ! 
    268       IF( lk_oasis )   CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step 
    269       !                                                     !                                            (2) the use of nn_fsbc 
    270  
     268      IF( lk_oasis ) THEN    
     269         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )             
     270         CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step    
     271                                      ! (2) the use of nn_fsbc    
     272      ENDIF    
    271273!     nn_fsbc initialization if OPA-SAS coupling via OASIS 
    272274!     sas model time step has to be declared in OASIS (mandatory) -> nn_fsbc has to be modified accordingly 
Note: See TracChangeset for help on using the changeset viewer.