| 43 | | The trunk has undergone major developments for CMIP6, which were frozen in tag2.0: [wiki:/DevelopmentActivities/CMIP6 Development for CMIP6]. |
| | 44 | Other significant evolutions of the trunk have followed: |
| | 45 | - '''[https://forge.ipsl.jussieu.fr/orchidee/browser/tags/ORCHIDEE_2_1 tag 2.1]''': based on trunk r5628 + bugs corrections, possibility to run with Dynamico, several updates of the libIGCM configurations + updates for jean-zay and irene-amd BUT the correction for downregulation that was implemented in tag2.0 has not been implemented in tag 2.1! [https://forge.ipsl.jussieu.fr/orchidee/wiki/ReferenceSimulations/ORCHIDEE_2_1 Complementary info and evaluations]. |
| | 46 | - '''[https://forge.ipsl.jussieu.fr/orchidee/browser/branches/ORCHIDEE_2_2 branch 2.2]''': based on r5716 of tag2.1 (03/12/2019), includes a fix for negative soil water and the correction for downregulation (as tag 2.0) and improvements for CO2 by Patricia Cadule. |
| | 47 | - '''trunk''': from r5639 onwards includes the nitrogen cycle (12/03/2018) and soil carbon discretization from MICT (r5738 and further). |
| | 48 | - '''[http://forge.ipsl.jussieu.fr/orchidee/browser/branches/ORCHIDEE_3?rev=6813 branch 3.0]''': created from r6610 of the trunk to implement code changes required to reach milestone 3.0. |
| | 49 | - '''trunk-head''': with r6614 milestone 4.0 was reached. Compared to previous versions of the trunk the following functionality was added: two-way albedo calculation, vertical and horizontal discretization of the canopy, hydraulic plant architecture, stand density, anthropogenic and natural dynamics of stand density, and mass balance closure for carbon and nitrogen (03/06/2020). Current functionality is described [https://forge.ipsl.jussieu.fr/orchidee/wiki/Documentation/TrunkFunctionality4 here] (with a focus on the new functionality).The TRUNK FORCE is currently working towards the objectives described in [https://forge.ipsl.jussieu.fr/orchidee/wiki/ReferenceSimulations/4.1 svn milestone 4.1]. More detailed test results for r6616 and further are stored [https://forge.ipsl.jussieu.fr/orchidee/wiki/ReferenceSimulations/6616 here]. |
| 45 | | Other significant evolutions of the trunk have followed, some of them related to "non-official" tags (used as milestones in the tickets): |
| 46 | | - '''[https://forge.ipsl.jussieu.fr/orchidee/browser/tags/ORCHIDEE_2_0 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]. |
| 47 | | - '''[https://forge.ipsl.jussieu.fr/orchidee/browser/tags/ORCHIDEE_2_1 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]. |
| 48 | | - '''[https://forge.ipsl.jussieu.fr/orchidee/browser/branches/ORCHIDEE_2_2 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 |
| 49 | | - '''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. |
| 50 | | - '''[http://forge.ipsl.jussieu.fr/orchidee/browser/branches/ORCHIDEE_3 branch 3.0]''': created from r6610 of above trunk to keep track of specific developments of 3.0 after "creation" of 4.0. |
| 51 | | - '''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]. |
| 52 | | |
| 53 | | 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). |
