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/OFF_SRC/nemogcm.F90

    r5836 r6140  
    5252   USE trcrst 
    5353   USE diaptr         ! Need to initialise this as some variables are used in if statements later 
     54   USE sbc_oce, ONLY: ln_rnf 
     55   USE sbcrnf 
    5456 
    5557   IMPLICIT NONE 
     
    9496      !                            !-----------------------! 
    9597      istp = nit000 
     98      ! 
     99      ! Initialize arrays of runoffs structures and read data from the namelist 
     100      IF ( ln_rnf ) CALL sbc_rnf(istp) 
    96101      !  
    97102      CALL iom_init( cxios_context )            ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 
     
    148153      NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   & 
    149154         &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle,   & 
    150          &             nn_bench, nn_timing 
     155         &             nn_bench, nn_timing, nn_diacfl 
    151156      NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, & 
    152157         &             jpizoom, jpjzoom, jperio, ln_use_jattr 
Note: See TracChangeset for help on using the changeset viewer.