Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (4 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge —reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/SAS_SRC/step.F90

    r6140 r7646  
    2323   USE eosbn2           ! equation of state                (eos_bn2 routine) 
    2424   USE diawri           ! Standard run outputs             (dia_wri routine) 
    25    USE bdy_par          ! clem: mandatory for LIM3 
    26 #if defined key_bdy 
     25   USE bdy_oce   , ONLY: ln_bdy 
    2726   USE bdydta           ! clem: mandatory for LIM3 
    28 #endif 
    2927   USE stpctl           ! time stepping control            (stp_ctl routine) 
    3028   ! 
     
    3836#endif 
    3937 
     38#if defined key_agrif 
     39   USE agrif_oce, ONLY: lk_agrif_debug  !clem 
     40#endif 
     41    
    4042   IMPLICIT NONE 
    4143   PRIVATE 
     
    7072#if defined key_agrif 
    7173      kstp = nit000 + Agrif_Nb_Step() 
     74      IF ( lk_agrif_debug ) THEN 
     75         IF ( Agrif_Root() .and. lwp) Write(*,*) '---' 
     76         IF (lwp) Write(*,*) 'Grid Number',Agrif_Fixed(),' time step ',kstp, 'int tstep',Agrif_NbStepint() 
     77      ENDIF 
     78 
     79      IF ( kstp == (nit000 + 1) ) lk_agrif_fstep = .FALSE. 
     80 
    7281# if defined key_iomput 
    7382      IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( cxios_context ) 
    7483# endif    
    7584#endif    
     85                             indic = 0                    ! although indic is not changed in stp_ctl 
     86                                                          ! need to keep the same interface  
    7687      IF( kstp == nit000 )   CALL iom_init( cxios_context ) ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 
    7788      IF( kstp /= nit000 )   CALL day( kstp )             ! Calendar (day was already called at nit000 in day_init) 
     
    8293      !           From SAS: ocean bdy data are wrong  (but we do not care) and ice bdy data are OK.   
    8394      !           This is not clean and should be changed in the future.  
    84 #if defined key_bdy 
    85       IF( lk_bdy     )       CALL bdy_dta ( kstp, time_offset=+1 )   ! update dynamic & tracer data at open boundaries 
    86 #endif 
     95      IF( ln_bdy     )       CALL bdy_dta ( kstp, time_offset=+1 )   ! update dynamic & tracer data at open boundaries 
    8796      ! ==> 
    8897                             CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice) 
     
    9099                             CALL dia_wri( kstp )         ! ocean model: outputs 
    91100 
    92                              indic = 0                    ! although indic is not changed in stp_ctl 
    93                                                           ! need to keep the same interface  
     101#if defined key_agrif 
     102      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
     103      ! AGRIF 
     104      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<       
     105                             CALL Agrif_Integrate_ChildGrids( stp )   
     106#endif 
     107                              
     108      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
     109      ! Control 
     110      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    94111                             CALL stp_ctl( kstp, indic ) 
     112      IF( indic < 0  )  THEN 
     113                             CALL ctl_stop( 'step: indic < 0' ) 
     114                             CALL dia_wri_state( 'output.abort', kstp ) 
     115      ENDIF 
     116      IF( kstp == nit000   ) CALL iom_close( numror )     ! close input  ocean restart file (clem: not sure...) 
     117       
    95118      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    96119      ! Coupled mode 
Note: See TracChangeset for help on using the changeset viewer.