Changes between Version 14 and Version 15 of Documentation/UserGuide/InstallingORCHIDEEBasic

Timestamp:

2016-05-02T10:34:43+02:00 (8 years ago)

Author:

jgipsl

Comment:

--

Documentation/UserGuide/InstallingORCHIDEEBasic

@@ -43 +43 @@
 
 == 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''' 
+Do as for the trunk but modify the file mod.def to extract a specific version of ORCHIDEE before launching the command '''./model ORCHIDEE_trunk'''. The file mod.def specifies all components to be extracted with the script model for each configuration predefined. [[BR]]
 
-DSG: shouldn't it read above '''mybranch/ORCHIDEE=ORCHIDEE-MICT''' instead of '''mybranch=ORCHIDEE-MICT'''?
+Do first:
 {{{
 svn co http://forge.ipsl.jussieu.fr/igcmg/svn/modipsl/trunk modipsl
 cd modipsl/util
-vi mod.def                  # Edit the line corresponding to extraction of ORCHIDEE sources for target ORCHIDEE_trunk
+}}}
 
-Change following line :
+Edit now the file mod.def for the line corresponding to extraction of ORCHIDEE sources for target ORCHIDEE_trunk.[[BR]]
+Following line needs to be changed :
+
+{{{
 #-C- ORCHIDEE_trunk  trunk/ORCHIDEE                           HEAD   14 ORCHIDEE         modeles
-into, with correct path to your branch or perso directory, HEAD can also be changed to a specific revision number :
-#-C- ORCHIDEE_trunk  branches/mybranch/ORCHIDEE               HEAD   14 ORCHIDEE         modeles
+}}}
 
+Replace ''trunk/ORCHIDEE'' by the path to your branch or personal directory. HEAD can also be changed to a specific revision number. For example for the branch ORCHIDEE-MICT, following should be set:
+
+{{{
+#-C- ORCHIDEE_trunk  branches/ORCHIDEE-MICT/ORCHIDEE               HEAD   14 ORCHIDEE         modeles
+}}}
+
+
+Now continue with the extraction of the model:
+{{{
 ./model ORCHIDEE_trunk
 cd ../config/ORCHIDEE_OL