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


Ignore:
Timestamp:
2020-02-28T11:28:01+01:00 (4 years ago)
Author:
peylin
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Documentation/UserGuide/InstallingORCHIDEEBasic

    v30 v31  
    4343'''ORCHIDEE trunk version older than revision 6572'''[[BR]] 
    4444 
    45 For older version of the trunk, the compilation script does not exist. For these versions there is a Makefile instead. The compilation is done in the same folder as above using following (note that your environment is important and modules need to be loaded before compilation, see [https://forge.ipsl.jussieu.fr/igcmg_doc/wiki/Doc/ComputingCenters igcmg_doc]: 
     45First see the description below to retreive any revision of the Trunk. 
     46For older version of the trunk than revision 6572, the compilation script described above does not exist. For these versions there is a Makefile instead. The compilation is done in the same folder as above using the following command (note that your environment is important and modules need to be loaded before compilation, see [https://forge.ipsl.jussieu.fr/igcmg_doc/wiki/Doc/ComputingCenters igcmg_doc]: 
    4647{{{ 
    47 modipsl/config/ORCHIDEE_OL 
     48cd modipsl/config/ORCHIDEE_OL 
    4849gmake 
    4950}}} 
     
    5152 
    5253== ORCHIDEE tagged versions == 
    53 The tagged versions of ORCHIDEE have a corresponding offline configuration which can be extracted using "./model target" and compiled in the same way as described for the trunk above. The target has the same name as the name of the tag. Currently there are 3 tagged versions available in modipsl by default: ORCHIDEE_2_1 (most recent tag), ORCHIDEE_2_0 (tag used for CMIP6) and ORCHIDEE_2_2 (actually a branch which some added developments). The version ORCHIDEE_AR5 also exists but is only available to extract source code without running and compiling possibility.  
     54 
     55The tagged versions of ORCHIDEE have a corresponding offline configuration which can be extracted using "./model target" and compiled in the same way as described for the trunk above. The target has the same name as the name of the tag. Currently there are 3 tagged versions available in modipsl by default: ORCHIDEE_2_1 (most recent tag), ORCHIDEE_2_0 (tag used for CMIP6) and ORCHIDEE_2_2 (actually a branch which some added developments). The version ORCHIDEE_AR5 also exists but is only available to extract the source code without running and compiling possibilities.  
    5456 
    5557To extract and compile do as follow: 
     
    6365 
    6466 
    65 == Branch or other version on svn == 
    66 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 predefined configuration. [[BR]] 
     67== Branches or other versions on svn == 
     68Do 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 a set of predefined configuration. You need to modify the set of lines dedicated to extract the "Trunk" in order to extract instead the specific Branch or version. Proceed as follow: [[BR]] 
    6769 
    6870Do first: 
     
    7274}}} 
    7375 
    74 Edit now the file mod.def for the line corresponding to extraction of ORCHIDEE sources for target ORCHIDEE_trunk.[[BR]] 
    75 Following lines needs to be changed : 
     76Now edit the file mod.def for the lines corresponding to the extraction of ORCHIDEE sources for the ORCHIDEE_trunk.[[BR]] 
     77Find the following lines that need to be changed : 
    7678 
    7779{{{ 
     
    8082}}} 
    8183 
    82 If you want a specific revision on the trunk, 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 together with a specific revision of the sources ORCHIDEE.  
     84If 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.  
     85 
     86{{{ 
     87#-C- ORCHIDEE_trunk  trunk/ORCHIDEE                           6580   14 ORCHIDEE         modeles 
     88#-C- ORCHIDEE_trunk  trunk/ORCHIDEE_OL                        HEAD   14 ORCHIDEE_OL      config 
     89}}} 
    8390 
    8491If 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: