Changes between Version 41 and Version 42 of ticket/1331_UKMO2_ice_shelves


Ignore:
Timestamp:
2014-11-27T14:07:57+01:00 (6 years ago)
Author:
mathiot
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/1331_UKMO2_ice_shelves

    v41 v42  
    9090 * What is needed to achieve regression with the previous model release (e.g. a regression branch, hand-edits etc). If this is not possible, explain why not. 
    9191   - domzgr.F90: Need to replace definition of gdep3w_0, e3uw_0 and e3vw_0, and e3t_1d and e3w_1d by the reference 3.6 version code 
    92    - zpshde.F90: The easiest thing to do is to keep the header and the variable definition.  
     92   - zpshde.F90: The easiest thing to do is to keep the header and the variable definition and replace the core of the routine by the 3.6.  
    9393   - dynhpg.F90: The easiest thing to do is to replace this routine by the reference 3.6 version. 
    9494 * What do you expect to see occur in the test harness jobs? 
     
    172172 * The development has been carried out by Pierre Mathiot on behalf of BAS along with Christopher Harris on behalf of the Met Office. The collaboration agreement is that BAS and UKMO work together to provide the code to be available within NEMO and distributed under the terms of the NEMO licence. 
    173173 * If all parties are happy with this, the header of modified routines should be like this:"3.7  ! 2014-11  P. Mathiot (BAS) and C. Harris (UK Met Office) add ice shelf cavity capabilities". 
     174 
     175---- 
     176=== SVN command (merge) === 
     177 
     178{{{ 
     179svn co svn+ssh://mathiot@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_r4650_UKMO2_ice_shelves dev_r4650_UKMO2_ice_shelves_merge 
     180cd dev_r4650_UKMO2_ice_shelves_merge/ 
     181svn merge svn+ssh://mathiot@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4879 
     182... conficts solved ... 
     183 
     184}}}