Changes between Version 4 and Version 5 of ticket/0684

Timestamp:

2010-06-25T16:51:22+02:00 (14 years ago)

Author:

acc

Comment:

--

ticket/0684

@@ -212 +212 @@
 }}}
 
-
+=== Step 5 === ought to be to merge in the changes between the head of the DEV_R1821_Rivers branch and the trunk@1821. This was done and gave rise
+to one minor conflict in sbcrnf.F90 (to do with the dimensionality of fnow which was increased by the 3DF branch). This is easily resolved but closer examination of the code and discussions with one of the reviewers (gm) suggests that the vertical distribution of the mass flux associated with the runoff has been omitted. The vertical distribution of temperature and salinity is coded but all the mass flux still occurs at the surface. The physical and numerical implications of this are unclear so this branch has been omitted from the mid-year merge until the matter can be resolved. Step 5 therefore is to merge in the changes on the trunk between revision 1821 and 1879 (which is the base version used for the DEV_1879_mpp_rep branch). 
 === Testing ===