Changes between Version 100 and Version 101 of DevelopmentActivities

Timestamp:

2020-06-17T12:03:22+02:00 (5 years ago)

Author:

aducharne

Comment:

--

DevelopmentActivities

@@ -31 +31 @@
 = Model Developments =
 
-Here is a description of the different versions of ORCHIDEE that are currently developed in parallel of the main version of ORCHIDEE. Ultimately, most of these versions will be merged to the main branch of development of ORCHIDEE model (trunk).Here below, are also presented the next evolutions of the trunk and the associated tags.[[BR]]
+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]
 
 
-- '''Highlights: [wiki:/DevelopmentActivities/CMIP6 Development for CMIP6]'''
+== Trunk evolutions around CMIP6 ==
 
-- '''[wiki:/GroupActivities/UseOfORCHIDEEpolicy]'''
+The trunk has undergone major developments for CMIP6, which were frozen in tag2.0: [wiki:/DevelopmentActivities/CMIP6 Development for CMIP6].
 
-- '''[wiki:/GroupActivities/CodeAvalaibilityPublication Code availability associated to a publication]'''
+Other significant evolotions of the trunk have followed, some of them related to "non-official" tags (used as milestones in the tickets):
+- tag 2.0: used for CMIP6v1 simulations (as of r5627) + updates for jean-zay and irene-amd + correction on downregulation
+- 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!
+- branch 2.2: 
+- trunk with "non-official" tag 3.0
+- trunk "non-official" tag 4.0
 
 
-== '''Current branches on the ORCHIDEE SVN server:''' ==
+== Current branches on the ORCHIDEE SVN server ==
 
 || Name of the branch || Person in charge     || Status*  ||  Wiki page || Description || Latest revision ||
@@ -92 +103 @@
 [[BR]]
 
-= On-going developments without a specific branch =
+== 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   ||