Ignore:
Timestamp:
2015-07-15T17:46:12+02:00 (5 years ago)
Author:
andrewryan
Message:

merged in latest version of trunk alongside changes to SAO_SRC to be compatible with latest OBS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/SAS_SRC/step.F90

    • Property svn:keywords set to Id
    r4166 r5600  
    1717   USE dom_oce          ! ocean space and time domain variables  
    1818   USE in_out_manager   ! I/O manager 
     19   USE sbc_oce 
     20   USE sbccpl 
    1921   USE iom              ! 
    2022   USE lbclnk 
     
    3638   USE timing           ! Timing             
    3739 
     40   USE bdy_par          ! clem: mandatory for LIM3 
     41#if defined key_bdy 
     42   USE bdydta           ! clem: mandatory for LIM3 
     43#endif 
     44 
    3845   IMPLICIT NONE 
    3946   PRIVATE 
     
    4653   !!---------------------------------------------------------------------- 
    4754   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    48    !! $Id: step.F90 3294 2012-01-28 16:44:18Z rblod $ 
     55   !! $Id$ 
    4956   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    5057   !!---------------------------------------------------------------------- 
     
    7279      kstp = nit000 + Agrif_Nb_Step() 
    7380# if defined key_iomput 
    74       IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( "nemo" ) 
     81      IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( cxios_context ) 
    7582# endif    
    7683#endif    
    77       IF( kstp == nit000 )   CALL iom_init( "nemo" )      ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 
     84      IF( kstp == nit000 )   CALL iom_init( cxios_context ) ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 
    7885      IF( kstp /= nit000 )   CALL day( kstp )             ! Calendar (day was already called at nit000 in day_init) 
    79                              CALL iom_setkt( kstp, "nemo" )       ! say to iom that we are at time step kstp 
     86                             CALL iom_setkt( kstp - nit000 + 1, cxios_context )   ! tell iom we are at time step kstp 
    8087 
     88      ! ==> clem: open boundaries is mandatory for LIM3 because ice BDY is not decoupled from   
     89      !           the environment of ocean BDY. Therefore bdy is called in both OPA and SAS modules. 
     90      !           From SAS: ocean bdy data are wrong  (but we do not care) and ice bdy data are OK.   
     91      !           This is not clean and should be changed in the future.  
     92#if defined key_bdy 
     93      IF( lk_bdy     )       CALL bdy_dta ( kstp, time_offset=+1 )   ! update dynamic & tracer data at open boundaries 
     94#endif 
     95      ! ==> 
    8196                             CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice) 
    8297 
     
    86101                                                          ! need to keep the same interface  
    87102                             CALL stp_ctl( kstp, indic ) 
     103      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
     104      ! Coupled mode 
     105      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
     106      IF( lk_oasis    )  CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges if OASIS-coupled ice 
     107 
    88108#if defined key_iomput 
    89       IF( kstp == nitend )   CALL iom_context_finalize( "nemo" ) ! needed for XIOS+AGRIF 
     109      IF( kstp == nitend .OR. indic < 0 ) THEN  
     110                             CALL iom_context_finalize( cxios_context ) ! needed for XIOS+AGRIF 
     111      ENDIF 
    90112#endif 
    91113      ! 
Note: See TracChangeset for help on using the changeset viewer.