Changes between Version 7 and Version 8 of Doc/Config/ORCHIDEE_OL

Timestamp:

10/10/19 17:50:11 (5 years ago)

Author:

jgipsl

Comment:

--

Doc/Config/ORCHIDEE_OL

@@ -14 +14 @@
  * forcesoil   : ''Currently not maintained'': to allow the carbon in the soil to reach equilibrium
 
-# Retrieval possibilities according to the sources' version # 
-## Retrieval with ./model of a predefined configuration ##
-You can retrieve several predefined configurations with the command ./model ''config_name'' and with the following config_name : 
+# Existing predefined configurations #
+Following predefined configurations exist currently for ORCHIDEE offline use, the install a different version of ORCHIDEE source code:
+ * ORCHIDEE_trunk   : the latest version on the trunk. '''Be careful: if you use this version the trunk results have not been evaluated! ''' This is often the version which is advised.
+ * ORCHIDEE_2_2     : a branch created from the tag ORCHIDEE_2_1. This branchs contains bug corrections and new developements needed for DYNAMICO
+ * ORCHIDEE_2_1     : the most recent tag, created from the trunk before inclusion of the nitrogen cycle in ORCHIDEE
+ * ORCHIDEE_2_0     : the CMIP6 version of ORCHIDEE
+ * ORCHIDEE_AR5     : the CMIP5 version, only sources code is extracted without configuration files
 
- * ORCHIDEE_trunk   : the latest trunk version (HEAD). '''Be careful: if you use this version the trunk results have not been evaluated! ''' This is often the version which is advised.
- * ORCHIDEE_TAG     : the latest ORCHIDEE tag (currently 1.9.6)
- * ORCHIDEE_SVN_AR5 : the CMIP5 version
+The configuration is extracted in modipsl/util using ./model. For example: ./model ORCHIDEE_trunk.
 
-## Retrieving another configuration version with ./model ##
-If you want to use a branch or a personal version on the SVN file depository of ORCHIDEE and '''if this version contains the ORCHIDEE/src_driver directory''', we recommend to change the ORCHIDEE_trunk configuration in mod.def and to retrieve this version with ./model ORCHIDEE_trunk. [wiki:DocCinstall#Syntaxinmod.def  Go here to learn more about how to change mod.def.]
+## Extract a branch or another version of ORCHIDEE ##
+If you want to use a branch or a personal version on the SVN file depository of ORCHIDEE, we recommend to change the ORCHIDEE_trunk configuration in mod.def and extract this version with ./model ORCHIDEE_trunk. [wiki:Doc/Install#Syntaxinmod.def Go here to learn more about how to change mod.def.]
 
 # Resolution #