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/NEMO/OPA_SRC/IOM/in_out_manager.F90

    r4624 r4990  
    111111   INTEGER ::   numstp          =   -1      !: logical unit for time step 
    112112   INTEGER ::   numtime         =   -1      !: logical unit for timing 
    113    INTEGER ::   numout          =    6      !: logical unit for output print 
     113   INTEGER ::   numout          =    6      !: logical unit for output print; Set to stdout to ensure any early 
     114                                            !  output can be collected; do not change 
    114115   INTEGER ::   numnam_ref      =   -1      !: logical unit for reference namelist 
    115116   INTEGER ::   numnam_cfg      =   -1      !: logical unit for configuration specific namelist 
    116    INTEGER ::   numond          =    7      !: logical unit for Output Namelist Dynamics 
     117   INTEGER ::   numond          =   -1      !: logical unit for Output Namelist Dynamics 
    117118   INTEGER ::   numnam_ice_ref  =   -1      !: logical unit for ice reference namelist 
    118119   INTEGER ::   numnam_ice_cfg  =   -1      !: logical unit for ice reference namelist 
    119    INTEGER ::   numoni          =    8      !: logical unit for Output Namelist Ice 
     120   INTEGER ::   numoni          =   -1      !: logical unit for Output Namelist Ice 
    120121   INTEGER ::   numevo_ice      =   -1      !: logical unit for ice variables (temp. evolution) 
    121122   INTEGER ::   numsol          =   -1      !: logical unit for solver statistics 
Note: See TracChangeset for help on using the changeset viewer.