Changeset 6548


Ignore:
Timestamp:
2016-05-17T16:37:02+02:00 (6 years ago)
Author:
frrh
Message:

Merge fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_cplseq
from refvision 5572 to 5646 inclusive i.e. all changes post NEMO 3.6 trunk
upgrade to source branch.

Location:
branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r6547 r6548  
    286286      ! In coupled mode get extra fields from CICE for passing back to atmosphere 
    287287  
    288       IF ( ksbc == jp_cpl ) CALL cice_sbc_hadgam(nit000) 
     288      IF ( ksbc == jp_purecpl ) CALL cice_sbc_hadgam(nit000) 
    289289      !  
    290290      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init') 
     
    712712      IF( nn_timing == 1 )  CALL timing_start('cice_sbc_hadgam') 
    713713      ! 
    714       IF( kt == nit000 )  THEN 
    715          IF(lwp) WRITE(numout,*)'cice_sbc_hadgam' 
    716          IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
    717       ENDIF 
    718  
    719714      !                                         ! =========================== ! 
    720715      !                                         !   Prepare Coupling fields   ! 
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r6542 r6548  
    265265      ENDIF 
    266266      ! 
    267       IF( lk_oasis )   CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step 
    268       !                                                     !                                            (2) the use of nn_fsbc 
     267      IF( lk_oasis ) THEN 
     268         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )          
     269         CALL sbc_cpl_init (nn_ice)   ! OASIS initialisation. must be done before: (1) first time step 
     270                                      !                                            (2) the use of nn_fsbc 
     271      ENDIF 
    269272 
    270273!     nn_fsbc initialization if OPA-SAS coupling via OASIS 
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r6547 r6548  
    166166            CALL Agrif_Step( stp )           ! AGRIF: time stepping 
    167167#else 
    168             IF (lk_cpl) CALL sbc_cpl_snd( istp )  ! Coupling to atmos 
     168            IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos 
    169169       CALL stp( istp ) 
    170170            ! We don't couple on the final timestep because 
Note: See TracChangeset for help on using the changeset viewer.