Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (5 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge —reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

File:
1 edited

Legend:

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

    r5510 r6140  
    1616   USE oce              ! ocean dynamics and tracers variables 
    1717   USE dom_oce          ! ocean space and time domain variables  
    18    USE in_out_manager   ! I/O manager 
    19    USE sbc_oce 
    20    USE sbccpl 
    21    USE iom              ! 
    22    USE lbclnk 
    23 #if defined key_iomput 
    24    USE xios 
    25 #endif 
    26  
    2718   USE daymod           ! calendar                         (day     routine) 
    28  
     19   USE sbc_oce          ! surface boundary condition: fields 
    2920   USE sbcmod           ! surface boundary condition       (sbc     routine) 
    3021   USE sbcrnf           ! surface boundary condition: runoff variables 
    31  
     22   USE sbccpl           ! surface boundary condition: coupled interface 
    3223   USE eosbn2           ! equation of state                (eos_bn2 routine) 
    33  
    3424   USE diawri           ! Standard run outputs             (dia_wri routine) 
    35    USE stpctl           ! time stepping control            (stp_ctl routine) 
    36    USE prtctl           ! Print control                    (prt_ctl routine) 
    37  
    38    USE timing           ! Timing             
    39  
    4025   USE bdy_par          ! clem: mandatory for LIM3 
    4126#if defined key_bdy 
    4227   USE bdydta           ! clem: mandatory for LIM3 
     28#endif 
     29   USE stpctl           ! time stepping control            (stp_ctl routine) 
     30   ! 
     31   USE in_out_manager   ! I/O manager 
     32   USE prtctl           ! Print control                    (prt_ctl routine) 
     33   USE iom              ! 
     34   USE lbclnk           ! 
     35   USE timing           ! Timing             
     36#if defined key_iomput 
     37   USE xios 
    4338#endif 
    4439 
     
    4641   PRIVATE 
    4742 
    48    PUBLIC   stp   ! called by opa.F90 
     43   PUBLIC   stp   ! called by nemogcm.F90 
    4944 
    50    !! * Substitutions 
    51 #  include "domzgr_substitute.h90" 
    52 #  include "zdfddm_substitute.h90" 
    5345   !!---------------------------------------------------------------------- 
    5446   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
Note: See TracChangeset for help on using the changeset viewer.