Changes between Version 31 and Version 32 of Documentation/UserGuide/InstallingORCHIDEEBasic

Timestamp:

2020-02-28T11:38:13+01:00 (4 years ago)

Author:

peylin

Comment:

--

Documentation/UserGuide/InstallingORCHIDEEBasic

@@ -82 +82 @@
 }}}
 
-If you want a specific revision on the trunk (i.e. revision 6580), then change HEAD in above lines to the revision you want. Note that you can often keep the HEAD revision of the ORCHIDEE_OL folder (offline configuration) together with a specific revision of the sources of ORCHIDEE. 
+If you want a specific revision on the trunk (i.e. revision 6580), then change HEAD in above lines to the revision you want.
+More information on the structure of "mod.def" can be found under: https://forge.ipsl.jussieu.fr/igcmg_doc/wiki/Doc/Install#Syntaxinmod.def. [[BR]]  
+Note that you can often keep the HEAD revision of the ORCHIDEE_OL folder (offline configuration) together with a specific revision of the sources of ORCHIDEE. 
 
 {{{
 #-C- ORCHIDEE_trunk  trunk/ORCHIDEE                           6580   14 ORCHIDEE         modeles
-#-C- ORCHIDEE_trunk  trunk/ORCHIDEE_OL                        HEAD   14 ORCHIDEE_OL      config
+#-C- ORCHIDEE_trunk  trunk/ORCHIDEE_OL                        6580   14 ORCHIDEE_OL      config
 }}}
 
-If you want to change to a branch or a personal version, then 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-CN-CAN, following should be set:
+If you want to change to a branch or a personal version, then 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-CN-CAN, the following should be set:
 {{{
 #-C- ORCHIDEE_trunk  branches/ORCHIDEE-CN-CAN/ORCHIDEE               HEAD   14 ORCHIDEE         modeles
@@ -95 +97 @@
 }}}
 
-If you version do not have a ORCHIDEE_OL folder, then keep the trunk version. 
+If your version do not have an ORCHIDEE_OL folder, then keep the one from the trunk version. 
 
-Now continue with the extraction of the model:
+Finally, when "mod.def" is modified, you can continue with the extraction of the model:
 {{{
 ./model ORCHIDEE_trunk
@@ -103 +105 @@
 }}}
 
-Compile using gmake (if the Makefile exist in your version) or ./compile_orchidee_ol.sh depending on the version.
-
+You can then compile using either ./compile_orchidee_ol.sh (see above) OR gmake (if the Makefile exist in your version) depending on the version.
 
 == NB! For old branches with fortran code in ORCHIDEE_OL directory ==
-''For exemple orchidee_FM''[[BR]][[BR]]
+''For exemple orchidee_FM''[[BR]]
 
-In the trunk and in the newer branches, the directory ORCHIDEE/src_driver contain the source code for the driver. In older versions, these files were stored in ORCHIDEE_OL directory. Therefor for these older branches, you have to extract ORCHIDEE and ORCHIDEE_OL from the branch. For running with libIGCM, we recomand to use the trunk version of the scripts in ORCHIDEE_OL. Extract the trunk/ORCHIDEE_OL and save it in ORCHIDEE_OL.trunk. In mod.def, the lines corresponding to extraction of ORCHIDEE becomes the following : 
+In the trunk and in the recent branches, the directory ORCHIDEE/src_driver contain the source code for the driver. In older versions, these files were stored in ORCHIDEE_OL directory. Therefore for these older branches, you have to extract ORCHIDEE and ORCHIDEE_OL from the branch. For running with libIGCM, we recomand to use the trunk version of the scripts in ORCHIDEE_OL. Extract the trunk/ORCHIDEE_OL and save it in ORCHIDEE_OL.trunk. In mod.def, the lines corresponding to extraction of ORCHIDEE becomes the following : 
 
 {{{
@@ -117 +118 @@
 }}}
 
-Note that the compiling is different:
+For these older branches, the compilation is different:
 
 {{{