Changeset 5479


Ignore:
Timestamp:
2015-06-24T16:35:45+02:00 (5 years ago)
Author:
cguiavarch
Message:

Changes for sequence of coupling calls in HadGEM3.

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

Legend:

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

    r4990 r5479  
    280280  
    281281      CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 ) 
    282       ! 
     282      ! In coupled mode get extra fields from CICE for passing back to atmosphere 
     283  
     284      IF ( nsbc == 5 ) CALL cice_sbc_hadgam(nit000) 
     285      !  
    283286      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init') 
    284287      ! 
  • branches/UKMO/dev_r5107_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r5477 r5479  
    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 
     
    162163            CALL Agrif_Step( stp )           ! AGRIF: time stepping 
    163164#else 
    164             CALL stp( istp )                 ! standard time stepping 
     165            IF (ln_cpl) CALL sbc_cpl_snd( istp )  ! Coupling to atmos 
     166       CALL stp( istp ) 
     167            ! We don't couple on the final timestep because 
     168            ! our restart file has already been written 
     169            ! and contains all the necessary data for a 
     170            ! restart. sbc_cpl_snd could be called here 
     171            ! but it would require 
     172            ! a) A test to ensure it was not performed 
     173            !    on the very last time-step 
     174            ! b) the presence of another call to 
     175            !    sbc_cpl_snd call prior to the main DO loop 
     176            ! This solution produces identical results 
     177            ! with fewer lines of code.  
    165178#endif 
    166179            istp = istp + 1 
  • branches/UKMO/dev_r5107_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/step.F90

    r5477 r5479  
    329329      ! Coupled mode 
    330330      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    331       IF( lk_cpl           )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges 
     331      !IF( lk_cpl           )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges 
    332332      ! 
    333333#if defined key_iomput 
Note: See TracChangeset for help on using the changeset viewer.