}}}
= Model Developments =
Here is a description of the different versions of ORCHIDEE that are currently developed in parallel of the main version of ORCHIDEE (trunk).
Ultimately, most of these versions shall be merged into the trunk.
Important general information for users of the trunk/branches:
- [wiki:/GroupActivities/UseOfORCHIDEEpolicy Policy for ORCHIDEE use]
- [wiki:/GroupActivities/CodeAvalaibilityPublication Code versioning for a publication]
== Trunk evolutions around CMIP6 ==
The trunk has undergone major developments for CMIP6, which were frozen in tag2.0: [wiki:/DevelopmentActivities/CMIP6 Development for CMIP6].
Other significant evolutions of the trunk have followed, some of them related to "non-official" tags (used as milestones in the tickets):
- '''tag 2.0''': based on r5107 of the trunk, for CMIP6 developments; r5627? used for CMIP6v1 simulations with enhancements for configuration ESM carbon; then updates for jean-zay and irene-amd and correction on downregulation. [https://forge.ipsl.jussieu.fr/orchidee/wiki/ReferenceSimulations/ORCHIDEE_2_0 Complementary info and evaluations].
- '''tag 2.1''': based on tag2.0 at r5627 + bugs corrections, possibility to run with Dynamico, several updates of the libIGCM configurations + updates for jean-zay and irene-amd BUT NO CORRECTION OF DOWNREGULATION! [https://forge.ipsl.jussieu.fr/orchidee/wiki/ReferenceSimulations/ORCHIDEE_2_1 Complementary info and evaluations].
- '''branch 2.2''': based on r5804 of tag2.1 (03/12/2019), to evolve as the standard ORCHIDEE version without nitrogen cycle; should include bug corrections and configuration updates also done in trunk (3.0 and 4.0) and can hold new developments; does include correction for downregulation and improvements for CO2 by Patricia Cadule
- '''trunk with "non-official tag" 3.0''' (or branch [http://forge.ipsl.jussieu.fr/orchidee/browser/branches/ORCHIDEE_3?rev=6813 ORCHIDEE3]??): starts with the commit of CN branch at r5639 (12/03/2018); with inclusion of soil carbon discretization from MICT branch at r5738.
- '''trunk "non-official tag" 4.0''': starts with commit of branch ORCHIDEE-CN-CAN at r6614 (03/06/2020). [https://forge.ipsl.jussieu.fr/orchidee/wiki/ReferenceSimulations/6616 Complementary info and evaluations].
Note also that the 2-layer soil hydrology (Choisnel scheme) and old snow schme have been removed from the trunk at r5454 and r5470 respectively, and this applies to tag 2.1, branch 2.2, and tags 3.0 and 4.0 (but not to tag2.0).
Question: were all bugs corrected in the trunk since the start of tag2.0 propagated in branch 2_2?
== Current branches on the ORCHIDEE SVN server ==
|| Name of the branch || Person in charge || Status* || Wiki page || Description || Latest revision ||
|| Assimilation || P. Maugis || active ||[wiki:DevelopmentActivities/Assimilation Assimilation] ||Work on ORCHIDEE version developed for assimilation system||
|| Fluorescence || F. Maignan || active ||[wiki:DevelopmentActivities/Fluorescence Fluorescence] || Implementation of fluorescence processes following the SCOPE model ||
|| ORCHIDEE_2_2 || J. Ghattas || active || || Copy from tag ORCHIDEE_2_1 with some bug corrections and enhencements added ||
|| ORCHIDEE-CN-CAN || S. Luyssaert || merged ||[wiki:DevelopmentActivities/ORCHIDEE-DOFOCO ORCHIDEE-CN-CAN] || Nitrogen cycle and canopy structure. Branch integrated in the trunk starting from r6614 ||
|| ORCHIDEE-CN-P || D. Goll || active ||[wiki:DevelopmentActivities/ORCHIDEE-CNP ORCHIDEE-CNP]|| Inclusion of the phosphorus cycle into ORCHIDEE-CN. ||
|| ORCHIDEE_GW || A. Ducharne || active || || Developments to get a coupling between groundwater and soil moisture in a "wetland" tile || [https://forge.ipsl.jussieu.fr/orchidee/browser/branches/ORCHIDEE-GW branch]||
|| ORCHIDEE-ICE || F. Maignan || active || || Develompent for nobio-ice ||
|| ORCHIDEE-IPSLCM5A2.1 || A. Cozic || active ||[wiki:DevelopmentActivities/ORCHIDEE-IPSLCM5A2 ORCHIDEE-IPSLCM5A2] || To be used with the coupled model IPSLCM5A2 ||
|| ORCHIDEE-LAK || C. Ottle || active ||[wiki:DevelopmentActivities/ORCHIDEE-LAK ORCHIDEE-LAK] || Lake developments ||
|| ORCHIDEE-MEB || C. Ottle || active ||[wiki:DevelopmentActivities/ORCHIDEE-MEB ORCHIDEE-MEB] || Multi enery budget in trunk version ||
|| ORCHIDEE-MICT || F. Maignan || active ||[wiki:DevelopmentActivities/ORCHIDEE-MICT-IMBALANCE-P ORCHIDEE-MICT-IMBALANCE-P] || High latitude processes + P cycle ||
|| ORCHIDEE-ROUTING || J. Polcher || active || || Development for the routing scheme ||
|| ORCHIDEE-SOM || B. Guenet || active ||[wiki:DevelopmentActivities/ORCHIDEE-SOM ORCHIDEE-SOM] || Work on the Organic Soil Carbon. ||
|| ORCHIDEE-SP-MIP || A. Ducharne || stand by || || Work integrated directly in the trunk ? ||
|| ORCHIDEE-BCOV || A. Cozic/J. Lathiere || stand by ||[wiki:DevelopmentActivities/ORCHIDEE-BCOV-Coupled ORCHIDEE and LMDzINCA coupling]||Coupling between ORCHIDEE and the chemistry-transport model LMDzINCA for biogenic emissions and vegetation distribution||
|| ORCHIDEE-STICS || || stand by+dead end || [wiki:DevelopmentActivities/Orchidee-Stics ORCHIDEE-STICS] ||Work on ORCHIDEE-STICS||
|| orchidee_FM || || stand by ||[wiki:DevelopmentActivities/ORCHIDEE-FM ORCHIDEE-FM]||Work on a new Forestry and isotope model of Valentin Belassem and Thomas Eglin. Functionality has been integrated in ORCHIDEE-DOFOCO, ORCHIDEE-CN-CAN and eventually the trunk||
|| ORCHIDEE-TROPICS || || stand by ||[wiki:DevelopmentActivities/ORCHIEE-TROPICS ORCHIDEE-TROPICS]|| Inclusion of the different developements done on the tropics. ||
|| ORCHIDEE-DOFOCO || S. Luyssaert || merged ||[wiki:DevelopmentActivities/ORCHIDEE-DOFOCO ORCHIDEE-CN-CAN] || Work of this branch is integrated in newer branch ORCHIDEE-CN-CAN ||
|| ORCHIDEE-DOFOCO-MULTI-COLUMN || J. Ryder || stand by || || ||
|| ORCHIDEE-CN || N. Vuichard || merged ||[wiki:DevelopmentActivities/ORCHIDEE-CN ORCHIDEE-CN]|| Version with N cycle. Branch integrated in the trunk rev 5639 ||
|| ORCHIDEE-CN_CONFIG || N. Vuichard || merged ||[wiki:DevelopmentActivities/ORCHIDEE-CN ORCHIDEE-CN]|| ORCHIDEE_OL corresponding to branch. Branch integrated in the trunk rev 5639 ||
|| ORCHIDEE-DYNAMICOXIOS || Y. Merudesoif || merged || || Developements for coupling to LMDZ-DYNAMICO and running on unstructured grid. Integrated in the trunk rev 5364 ||
|| ORCHIDEE-DRIVER || J. Polcher || merged || || Including 1) a new offline driver without prerequiries, 2) a new driver to be used with OASIS and 3) enhancement to run with different type of grid as for WRF ||
|| Hydrology || || merged ||[wiki:DevelopmentActivities/MergeHydro MergeHydro]||Work on the merge between LMD version and version 1.9.5.2||
|| Photosynthesis || N. Vuichard || merged ||[wiki:DevelopmentActivities/Photosynthesis Photosynthesis]|| Work on the photosynthesis scheme of ORCHIDEE. ||
|| ORCHIDEE_NEW_PHENO || N. Vuichard || merged || [wiki:DevelopmentActivities/ORCHIDEE-NEWPHENO ORCHIDEE-NEWPHENO] || Work on new phenology, personal version ||
|| DOC || || merged || || Scientific documentation ||
|| Spinup_analytic || N. Vuichard || merged+closed ||[wiki:DevelopmentActivities/AccelerationSpinup Acceleration of the Spinup]||Work on acceleration of the spin-up|| [1132] ||
|| OpenMP2 || A. Cozic || merged || || ||
|| ORCHIDEE-CNP || D. Goll || stopped || || Inclusion of the phosphorus cycle into MERGE-OCN. ||
|| ORCHIDEE-DYNAMICO || L. Fita/ J. Polcher || dead-end ||[wiki:DevelopmentActivities/ORCHIDEE-DYNAMICO ORCHIDEE-DYNAMICO] || Coupling with DYNAMICO/LMDZ ||
|| MERGE-OCN || N. Vuichard || stopped ||[wiki:DevelopmentActivities/MergeOCN MERGE-OCN]|| Inclusion of the nitrogen cycle into ORCHIDEE - First version. ||
|| orchidee_N || || stopped || || Old version of OCN ||
|| ORCHIDEE_HIGH_LAT || || dead end ||[wiki:DevelopmentActivities/ORCHIDEE-HIGH-LATITUDES ORCHIDEE-HIGH-LATITUDES]||Version of ORCHIDEE developed for studies on high latitudes areas and wetlands ||
|| OpenMP || || dead end || || ||
|| Restruct_Stomate || || dead end || || ||
*status :
* active: work currently on going
* stand by: work temporary stopped
* merged: development added in the trunk
* dead end: work on the branch is stopped and will not go into the trunk
* closed: the branch is closed
[[BR]]
== On-going developments without a specific branch ==
||Wiki page || Person in charge || Status || Description ||
||[wiki:DevelopmentActivities/Multi-tiling Multi-tiling] || collective work || active || Implementation of multi-tiling developments in ORCHIDEE ||
||[wiki:DevelopmentActivities/DGVM DGVM] || collective work || active || ||
||[wiki:DevelopmentActivities/SNOW SNOW] || collective work || active || ||
||[wiki:DevelopmentActivities/ORCHIDEE-BRIC ORCHIDEE-BRIC] || J. Lathiere || active || Inclusion of reactive compound emissions from vegetation: biogenic VOCs and NOx ||
||[wiki:DevelopmentActivities/Xios Xios] || J. Ghattas || merged || Using XIOS as output library ||
||[wiki:DevelopmentActivities/SoilDepthSpatialization SoilDepthSpatialization] || || dead end || Spatialization of the soil depth ||
||[wiki:DevelopmentActivities/CarbonMassBalance CarbonMassBalance] || || || Check for mass balance closure ||
||[wiki:DevelopmentActivities/Isotopes Isotopes] || C. Risi || || Work on inclusion of isotopes and tracers into ORCHIDEE ||
||[wiki:DevelopmentActivities/ORCHIDEE-OzoneImpact ORCHIDEE-OzoneImpact]|| || || Inclusion of the impact of atmospheric chemical composition on vegetation, starting with ozone ||