Changeset 6547


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

Merge fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_cplseq rev 5479 to
5491 inclusive (i.e. all changes prior to upgrade of source branch to vn3.6
trunk.

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

Legend:

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

    r6542 r6547  
    188188      ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) )  ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init) 
    189189#endif 
    190       ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 
     190      !ALLOCATE( xcplmask(jpi,jpj,nn_cplmodel) , STAT=ierr(3) ) 
     191      ! Hardwire only two models as nn_cplmodel has not been read in 
     192      ! from the namelist yet. 
     193      ALLOCATE( xcplmask(jpi,jpj,2) , STAT=ierr(3) )    
    191194      ! 
    192195      sbc_cpl_alloc = MAXVAL( ierr ) 
     
    274277 
    275278      !                                   ! allocate sbccpl arrays 
    276       IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
     279      !IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
    277280      
    278281      ! ================================ ! 
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r6542 r6547  
    284284      CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 ) 
    285285      ! 
     286      ! In coupled mode get extra fields from CICE for passing back to atmosphere 
     287  
     288      IF ( ksbc == jp_cpl ) CALL cice_sbc_hadgam(nit000) 
     289      !  
    286290      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init') 
    287291      ! 
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r6545 r6547  
    6868   USE icbini          ! handle bergs, initialisation 
    6969   USE icbstp          ! handle bergs, calving, themodynamics and transport 
     70   USE sbccpl  
    7071   USE cpl_oasis3      ! OASIS3 coupling 
    7172   USE c1d             ! 1D configuration 
     
    165166            CALL Agrif_Step( stp )           ! AGRIF: time stepping 
    166167#else 
    167             CALL stp( istp )                 ! standard time stepping 
     168            IF (lk_cpl) CALL sbc_cpl_snd( istp )  ! Coupling to atmos 
     169       CALL stp( istp ) 
     170            ! We don't couple on the final timestep because 
     171            ! our restart file has already been written 
     172            ! and contains all the necessary data for a 
     173            ! restart. sbc_cpl_snd could be called here 
     174            ! but it would require 
     175            ! a) A test to ensure it was not performed 
     176            !    on the very last time-step 
     177            ! b) the presence of another call to 
     178            !    sbc_cpl_snd call prior to the main DO loop 
     179            ! This solution produces identical results 
     180            ! with fewer lines of code.  
    168181#endif 
    169182            istp = istp + 1 
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/step.F90

    r6544 r6547  
    358358      ! Coupled mode 
    359359      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    360       IF( lk_oasis         )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges 
     360      !IF( lk_cpl           )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges 
    361361      ! 
    362362#if defined key_iomput 
Note: See TracChangeset for help on using the changeset viewer.