Changes between Version 12 and Version 13 of Documentation/UserGuide/InstallingORCHIDEEBasic

Timestamp:

2016-01-18T11:06:53+01:00 (7 years ago)

Author:

jgipsl

Comment:

--

Documentation/UserGuide/InstallingORCHIDEEBasic

@@ -1 +1 @@
 = How to install ORCHIDEE with modipsl and libIGCM for offline use =
+[[PageOutline]]
 
 Here I describe how to install a version of ORCHIDEE created after the re-organization of driver sources, this means all versions of ORCHIDEE containg the src_driver directory. If the branch or personal version you want to use contains both ORCHIDEE and ORCHIDEE_OL directories, then you can extract using the script '''recup_my_ORCHIDEE'''. Otherwise if you have only ORCHIDEE directory, extract using the script '''model''' as below. The configuration files will then be the latest trunk version.
@@ -5 +6 @@
 NEW!!! This page has been updated to use the compiling method with fcm. If you want to know more about compiling ORCHIDEE, see [wiki:HowTo/CompileMethods].
 
-== 1. For ORCHIDEE trunk version ==
+== ORCHIDEE trunk version ==
 To extract and compile the latest trunk version of ORCHIDEE and configuration files for offline simulations :
 {{{
@@ -15 +16 @@
 }}}
 
-== 2. For ORCHIDEE latest tag (1.9.6) or AR5 version(tag 1.9.5) ==
-To extract and compile the latest tagged version of ORCHIDEE and configuration files for offline simulations (use ORDHIDEE_TAG for tag 1.9.6 and ORCHIDEE_SVN_AR5 for tag 1.9.5):
+=== Specific revision on the trunk ===
+It is possible to define a specific revision on the trunk before extraction. The file util/mod.def describes the contents for all predefined configurations. For example the content in configuration ORCHIDEE_trunk are ORCHIDEE, XIOS, IOIPSL, libIGCM and configuration directory ORCHIDEE_OL. All these components have a specific revision number set in mod.def or HEAD which means the latest revision on the version. [[BR]]
+
+Change in mod.def before extracting the model by ./model ORCHIDEE_trunk to have the revision XXX on trunk ORCHIDEE:
 {{{
-svn co http://forge.ipsl.jussieu.fr/igcmg/svn/modipsl/trunk modipsl
-cd modipsl/util
-./model ORCHIDEE_TAG                         # or for AR5 : ./model ORCHIDEE_SVN_AR5
-cd ../modeles/ORCHIDEE_OL
-gmake orchidee_ol
+#-C- ORCHIDEE_trunk  trunk/ORCHIDEE                           HEAD    14 ORCHIDEE           modeles
+#-C- ORCHIDEE_trunk  trunk/ORCHIDEE_OL                        HEAD    14 ORCHIDEE_OL        config
+}}}
+into
+{{{
+#-C- ORCHIDEE_trunk  trunk/ORCHIDEE                           XXX     14 ORCHIDEE           modeles
+#-C- ORCHIDEE_trunk  trunk/ORCHIDEE_OL                        HEAD    14 ORCHIDEE_OL        config
+}}}
+Note that for most cases you do not need to change ORCHIDEE_OL revision. This directory contains the configurations files to run with libIGCM. Sometimes there are incoherences between older revisions of ORCHIDEE and the latest version of the configuration but in most cases it is recommended to take the latest version of the configuration.
+
+
+It is also possible to change the revision of ORCHIDEE after the configuration has been extracted. In that case, go to modeles/ORCHIDEE directory and update using svn:
+
+{{{
+cd modipsl/modeles/ORCHIDEE
+svn info                                       # To know which version you extracted
+svn stat                                       # To know if you have any local modifications
+svn update -r XXX
 }}}
 
 
-== 3. For branch or other version on svn ==
+== Branch or other version on svn ==
 Do as method 1 but modify the file mod.def to extract a specific version of ORCHIDEE. The file mod.def specifies all components to be extracted with the script model for each configuration predefined. [[BR]]
 Set for example '''mybranch=ORCHIDEE-MICT''' or '''mybranch=ORCHIDEE-DOFOCO'''. For a personal version, for example change '''branches/mybranch into perso/xiuchen.wu/ORCSTICS''' 
@@ -43 +59 @@
 cd ../config/ORCHIDEE_OL
 gmake
+}}}
+
+== ORCHIDEE latest tag (1.9.6) or AR5 version(tag 1.9.5) ==
+To extract and compile the latest tagged version of ORCHIDEE and configuration files for offline simulations (use ORDHIDEE_TAG for tag 1.9.6 and ORCHIDEE_SVN_AR5 for tag 1.9.5):
+{{{
+svn co http://forge.ipsl.jussieu.fr/igcmg/svn/modipsl/trunk modipsl
+cd modipsl/util
+./model ORCHIDEE_TAG                         # or for AR5 : ./model ORCHIDEE_SVN_AR5
+cd ../modeles/ORCHIDEE_OL
+gmake orchidee_ol
 }}}