Ignore:
Timestamp:
2014-12-15T17:42:49+01:00 (6 years ago)
Author:
timgraham
Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

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/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/TOOLS/COMPILE/bldxag.cfg

    r4865 r4990  
    4949bld::excl_dep        inc::mpe_logf.h 
    5050bld::excl_dep        use::mpi 
    51 bld::excl_dep        use::mod_prism_proto 
    52 bld::excl_dep        use::mod_prism_def_partition_proto 
    53 bld::excl_dep        use::mod_prism_get_comm 
    54 bld::excl_dep        use::mod_prism_get_proto 
    55 bld::excl_dep        use::mod_prism_put_proto 
    56 bld::excl_dep        use::mod_comprism_proto 
     51bld::excl_dep        use::mod_oasis 
    5752bld::excl_dep        use::mkl_dfti 
    5853# Don't generate interface files 
Note: See TracChangeset for help on using the changeset viewer.