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/OPA_SRC/LBC/mppini.F90

    r4679 r6140  
    1111   !!   mpp_init_ioispl: IOIPSL initialization in mpp 
    1212   !!---------------------------------------------------------------------- 
    13    !! * Modules used 
    1413   USE dom_oce         ! ocean space and time domain  
    1514   USE in_out_manager  ! I/O Manager 
     
    2322   PUBLIC mpp_init2      ! called by opa.F90 
    2423 
    25    !! * Substitutions 
    26 #  include "domzgr_substitute.h90" 
    2724   !!---------------------------------------------------------------------- 
    2825   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     
    457454#  include "mppini_2.h90" 
    458455 
    459 # if defined key_dimgout 
    460    !!---------------------------------------------------------------------- 
    461    !!   'key_dimgout'                  NO use of NetCDF files 
    462    !!---------------------------------------------------------------------- 
    463    SUBROUTINE mpp_init_ioipsl       ! Dummy routine 
    464    END SUBROUTINE mpp_init_ioipsl   
    465 # else 
    466456   SUBROUTINE mpp_init_ioipsl 
    467457      !!---------------------------------------------------------------------- 
     
    509499   END SUBROUTINE mpp_init_ioipsl   
    510500 
    511 # endif 
    512501#endif 
    513502 
Note: See TracChangeset for help on using the changeset viewer.