= Merge-Hydro Branch =

This version will merge the version of ORCHIDEE developed at LMD with the 11-layer hydrological scheme into the latest version of the trunk (1.9.5.2). Based on the differences between the LMD version and those from which it originates (either 1_9 or 1_9_4_1) (see the attachments), several notes have been written in order to prepare the merge. Here below are the links to these notes.

The '''hydrology''' group is : isabelle.gouttevin,jpolcher,aducharne,aurelien.campoy,matthieu.guimberteau,gerhard.krinner,nathalie.de-noblet,catherine.ottle,pierre.brender.[[BR]]
All those people can download the new version with modipsl and two commands in modipsl/util :
 1. Get the ORCHIDEE TOOLS-box 
{{{
> svn co svn://forge.ipsl.jussieu.fr/orchidee/trunk/TOOLS
}}}
 1. Get the hydrology version (with mail of Martial, please)
{{{
> TOOLS/recup_my_ORCHIDEE my_svn.login_name branches/Hydrology  Martial.Mancip _ at _ ipsl.jussieu.fr
}}}

== Notes to prepare the merge ==

[wiki:Branches/MergeHydro/cwrr_note Note on CWRR]

[wiki:Branches/MergeHydro/evapnu_note Note on evapnu]

[wiki:Branches/MergeHydro/dpu_note Note on dpu]

[wiki:Branches/MergeHydro/flag_couple_note Note on flag couple]

[wiki:Branches/MergeHydro/logz0_note Note on logz0]

[wiki:Branches/MergeHydro/lai_note Note on LAI]

[wiki:Branches/MergeHydro/Soilmap_note Note on Soil Map]

[wiki:Branches/MergeHydro/Interpolation_note Note on Interpolations]

[wiki:Branches/MergeHydro/Martial_notes_on_merge Martial notes for the merge]

== Testing the Merge-Hydro version ==

[wiki:Branches/MergeHydro/Matthieu_notes_on_merge Matthieu Guimberteau: Off-line tests in the Amazon with bug corrections]

Aurélien Campoy (Feb 2012) - test peformed off-line using 50 years of SAFRAN met forcing for the SIRTA site, without routing, without STOMATE : compares reasonably well with the CWRR version of ORCHIDEE before the merge

Nicolas Vuichard (March 2012) - off-line tests at FLUXNET sites using STOMATE : ongoing

Fabienne Maignan (March 2012) - global off-line simulation : ongoing

Frédérique Cheruy - global simulation coupled to LMDz : to be done