Changes between Version 10 and Version 11 of Documentation/UserGuide/InstallingORCHIDEEBasic

Timestamp:

2014-06-18T10:31:29+02:00 (10 years ago)

Author:

jgipsl

Comment:

--

Documentation/UserGuide/InstallingORCHIDEEBasic

@@ -5 +5 @@
 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 ==
+== 1. For ORCHIDEE trunk version ==
 To extract and compile the latest trunk version of ORCHIDEE and configuration files for offline simulations :
 {{{
@@ -15 +15 @@
 }}}
 
-== 2. For ORCHIDEE latest tag (1.9.6) ==
-To extract and compile the latest tagged version of ORCHIDEE and configuration files for offline simulations :
+== 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):
 {{{
 svn co http://forge.ipsl.jussieu.fr/igcmg/svn/modipsl/trunk modipsl
 cd modipsl/util
-./model ORCHIDEE_TAG
+./model ORCHIDEE_TAG                         # or for AR5 : ./model ORCHIDEE_SVN_AR5
 cd ../modeles/ORCHIDEE_OL
 gmake orchidee_ol
@@ -26 +26 @@
 
 
-
-== 3. For branche other version on svn ==
-If you want another version of ORCHIDEE, before compiling change the version of ORCHIDEE, in this case you will keep the configuration files from the trunk version : 
-{{{
-svn co http://forge.ipsl.jussieu.fr/igcmg/svn/modipsl/trunk modipsl
-cd modipsl/util
-./model ORCHIDEE_trunk
-cd ../modeles
-rm -fr ORCHIDEE
-svn co svn://forge.ipsl.jussieu.fr/orchidee/branches/xxxxxxx/ORCHIDEE ORCHIDEE     # or a copy from a local version of ORCHIDEE
-cd ../util ; ./ins_make      # Create makefiles
-cd ../modeles/ORCHIDEE
-gmake driver
-}}}
-
-== 4. Recommanded method for branches: For branch or other version on svn : methode 2 ==
+== 3. For 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. Set for example '''mybranch=ORCHIDEE-MICT''' or '''mybranch=ORCHIDEE-DOFOCO'''.
 
@@ -57 +42 @@
 cd ../config/ORCHIDEE_OL
 gmake
+}}}
+
+== Optional method for a branch or other version on svn ==
+You can also install the trunk and afterwards remove ORCHIDEE and change it to another version from svn or a local version. In this case you will keep the configuration files from the trunk version : 
+{{{
+svn co http://forge.ipsl.jussieu.fr/igcmg/svn/modipsl/trunk modipsl
+cd modipsl/util
+./model ORCHIDEE_trunk
+cd ../modeles
+rm -fr ORCHIDEE
+svn co svn://forge.ipsl.jussieu.fr/orchidee/branches/xxxxxxx/ORCHIDEE ORCHIDEE     # or a copy from a local version of ORCHIDEE
+cd ../util ; ./ins_make      # Create makefiles
+cd ../modeles/ORCHIDEE
+gmake driver
 }}}