Ignore:
Timestamp:
2019-06-13T18:20:13+02:00 (18 months ago)
Author:
dancopsey
Message:

Merged in changes from dev_merge_2017_GC_couple_pkg branch except for zotx1 and zoty1 changes in sbccpl.F90.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/SBC/sbcmod.F90

    r10888 r11105  
    291291      !                             !* OASIS initialization 
    292292      ! 
    293       IF( lk_oasis )   CALL sbc_cpl_init( nn_ice )   ! Must be done before: (1) first time step 
    294       !                                              !                      (2) the use of nn_fsbc 
     293      IF( lk_oasis ) THEN 
     294         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )  
     295         CALL sbc_cpl_init( nn_ice )   ! Must be done before: (1) first time step 
     296                                       !                      (2) the use of nn_fsbc 
     297      ENDIF 
    295298      !     nn_fsbc initialization if OPA-SAS coupling via OASIS 
    296299      !     SAS 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.