| 1 | [[PageOutline(2,Table des matières,inline)]] |
| 2 | |
| 3 | = Description of differences between ORCHIDEE versions = |
| 4 | Last change : 2009-01-27 |
| 5 | |
| 6 | This page describe the different ORCHIDEE versions. Only physical or important informatic |
| 7 | differences will be describe. Then no line cut nore modifications in comments in this description.[[BR]] |
| 8 | |
| 9 | To get a specific version of ORCHIDEE, you can use this alias in your .cshrc : |
| 10 | {{{ |
| 11 | alias cvs_orc 'cvs -d :pserver:sechiba@cvs.ipsl.jussieu.fr:/home/ssipsl/CVSREP' |
| 12 | }}} |
| 13 | You must have ORCHIDEE source login/password registred in your ~/.cvspass file. [[BR]] |
| 14 | You must ask Martial Mancip (or other authorized ORCHIDEE group members) |
| 15 | for login/password to access to the protected source (not by mail) - see |
| 16 | [http://www.ipsl.jussieu.fr/~mmaipsl Martial Mancip] for contact. |
| 17 | |
| 18 | When this configuration is set correctly (and adapted if your login shell is bash or other), |
| 19 | you can get a specific orchidee_version_to_get with the simple command : |
| 20 | {{{ |
| 21 | prompt> cvs_orc co -r orchidee_version_to_get ORCHIDEE |
| 22 | }}} |
| 23 | For branch TAGs only, you must specify the date of the beginning of the branch, otherwise you will |
| 24 | get le last point of the branch by default : |
| 25 | {{{ |
| 26 | prompt> cvs_orc co -r orchidee_branch_to_get -d the_date ORCHIDEE |
| 27 | }}} |
| 28 | |
| 29 | |
| 30 | A presentation of differencies between versions 1.3 - 1.6 and series 1.9 is here : |
| 31 | * http://dods.ipsl.jussieu.fr/orchidee/point_version_1.3-1.6-1.9.pdf |
| 32 | * http://dods.ipsl.jussieu.fr/orchidee/Bilan_Passage1.4_A_1.5.doc |
| 33 | |
| 34 | == Models and Configurations == |
| 35 | Model ORCHIDEE can be reach at link |
| 36 | [http://forge.ipsl.jussieu.fr/orchidee/viewvc/?root=orchidee ORCHIDEE source]. |
| 37 | |
| 38 | Each ORCHIDEE versions are validated with three sort of runs : |
| 39 | * OFF-LINE mode : |
| 40 | * that is for ORCHIDEE group the mode with ORCHIDEE_OL driver. |
| 41 | Please have a look on [http://orchidee.ipsl.jussieu.fr/ ORCHIDEE Scientific Web] |
| 42 | * In this configuration, we use atmospheric climatology to force the surface model. |
| 43 | There are two sorts of atmospheric datas : |
| 44 | * NCC datas high frequency (6 hours average) in one degree resolution. |
| 45 | The model will interpolate them to obtain half hour |
| 46 | time step values. |
| 47 | * WG_cru file with monthly average datas. |
| 48 | The driver has a special mode to generate half hour time step values. |
| 49 | The resolution can change from half degree to four degrees. |
| 50 | * Most versions were tested with NCC files with 20 years runs from 1980 to 1999. |
| 51 | Then we compare last 10 years averages. |
| 52 | * ON-LINE mode : |
| 53 | * that is for ORCHIDEE group the mode where ORCHIDEE is built as a module of the |
| 54 | atmospheric model LMDz4 (see [http://web.lmd.jussieu.fr/cgi-bin/viewvc.cgi/LMDZ4/ LMDZ4]). |
| 55 | * In this configuration, we use a 96x71 grid to validate TO DO. |
| 56 | * Couple mode : |
| 57 | * that is the Global Climate Model of IPSL. |
| 58 | See [http://igcmg.ipsl.jussieu.fr/ IGCMG Web] and [http://forge.ipsl.jussieu.fr/igcmg IGCMG Models] for more |
| 59 | informations. |
| 60 | * In this configuration, we have all IPSL climate models coupled together. |
| 61 | It is the IPCC configuration. |
| 62 | |
| 63 | == Versions == |
| 64 | |
| 65 | List of ORCHIDEE TAGs and Branchs and TAG action date : |
| 66 | * MAIN 08/02/2000 : ORCHIDEE CVS creation point. |
| 67 | * orchidee-1-0 03/02/2002 : first ORCHIDEE version (not describe here). |
| 68 | * orchidee_1_1 12/04/2002 : first reference version (not describe here). |
| 69 | * orchidee_1_2 03/04/2003 : Beginning of '''reference branch'''. This the beginning of the so called "reference branch" by people.[[BR]] |
| 70 | This branch has 4 TAGs : |
| 71 | * orchidee_1_3 : This TAG has a branch for adding compilation in brodie IDRIS calculator : orchidee_1_3_1. |
| 72 | * This specific branch orchidee_1_3_1 won't be compared because there is no modification on source code. |
| 73 | * Only makefiles were updated. |
| 74 | * orchidee_1_4 |
| 75 | * orchidee_1_5 |
| 76 | * orchidee_1_6 |
| 77 | * orchidee_1_3 04/01/2004 : TAG version used for '''IPCC AR4''' for IPSL_CM4_v1_OASIS3 couple model. |
| 78 | * orchidee_1_4 09/01/2005 : TAG for LOOP couple model. |
| 79 | * orchidee_1_5 11/07/2006 : First implementation of so called "orchidee_beton". It contains modifications of Frederic Hourdin. [[BR]] |
| 80 | This version has many bugs and shouldn't be used. |
| 81 | * orchidee_1_6 ../../.... : That is the '''end of "reference branch"'''. Implementation of Nathalie De Noblet modifications. [[BR]] |
| 82 | This is the right version with a lot of bug corrections. |
| 83 | * orchidee_1_7 09/15/2006 : Intermediate TAG in root of parallel branch ORCHIDEE_PARA. |
| 84 | * ORCHIDEE_PARA 11/07/2006 : working branch for parallel version. [[BR]] |
| 85 | This version has many bugs and shouldn't be used. |
| 86 | * orchidee_1_8 ../../.... : First merge of FH/NdN in HEAD branch.[[BR]] |
| 87 | This version has many bugs and shouldn't be used. |
| 88 | * orchidee_1_9 ../../.... : Add parallelization. [[BR]] |
| 89 | This version has many bugs and shouldn't be used. |
| 90 | * orchidee_1_9_1 ../../.... : Tag japan. |
| 91 | * orchidee_1_9_2 04/08/2006 : ajout correction hdry hydrolc + slowproc land_use (with only one year). |
| 92 | * orchidee_1_9_3 : Last standard STOMATE model (with 12 PFTs). This is a branch and should change in the future. [[BR]] |
| 93 | This is '''the right version''' with a lot of bug corrections. |
| 94 | * orchidee_1_9_4 : Parallel "MERGE" version with 13 PFTs in STOMATE. |
| 95 | |
| 96 | == Difference between versions == |
| 97 | |
| 98 | To see difference between version, you have to get both version in local (namely orchidee_path_1, |
| 99 | orchidee_path_2). Then you can apply two commands to see informations between versions : |
| 100 | {{{ |
| 101 | diff -w --ignore-all-space --ignore-case --recursive --exclude="Entries" --exclude="Tag" \ |
| 102 | orchidee_path_1/ORCHIDEE/ orchidee_path_2/ORCHIDEE/ > diff_1-2.f90 |
| 103 | }}} |
| 104 | And to get log informations with date1 and date2 refered respectively to TAG actions dates |
| 105 | for version1 and version2 (see TAG informations above) : |
| 106 | {{{ |
| 107 | cvs log -d 'date1+1<date2' > cvs_log_diff_1_2-1_3 |
| 108 | }}} |
| 109 | note : |
| 110 | 1. I put "date1+1" that means "date1 + 1 day" because you only want to see commit messages |
| 111 | after version1 TAG. [[BR]] For example, orchidee_1_1 has been tagged the 12/04/2002. Then you must use |
| 112 | date1+1 = 12/05/2002 (dates for CVS are in american format). |
| 113 | 2. You will get all informations on commits between the two dates. Then you will get some commit messages |
| 114 | on other branch too if there are some. |
| 115 | |
| 116 | |
| 117 | === differencies between orchidee_1_1 and orchidee_1_2 === |
| 118 | The differencies between orchidee_1_1 and orchidee_1_2 are describe here [wiki:ModelVersions/Diff1_1-1_2 Differences orchidee_1_1-1_2] . |
| 119 | |
| 120 | |
| 121 | === differencies between orchidee_1_2 and orchidee_1_3 === |
| 122 | The differencies between orchidee_1_2 and orchidee_1_3 are describe here [wiki:ModelVersions/Diff1_2-1_3 Differences orchidee_1_2-1_3] . |
| 123 | |
| 124 | === differencies between orchidee_1_3 and orchidee_1_4 === |
| 125 | |
| 126 | === differencies between orchidee_1_4 and orchidee_1_6 === |
| 127 | |
| 128 | === differencies between orchidee_1_2 and orchidee_1_7 === |
| 129 | The differencies between orchidee_1_2 and orchidee_1_7 are describe here [wiki:ModelVersions/Diff1_2-1_7 Differences orchidee_1_2-1_7] . |
| 130 | |
| 131 | * orchidee_1_7 09/15/2006 : Intermediate TAG in root of parallel branch ORCHIDEE_PARA. |
| 132 | * ORCHIDEE_PARA 11/07/2006 : working branch for parallel version. [[BR]] |
| 133 | |
| 134 | === differencies between orchidee_1_7 and orchidee_1_8 === |
| 135 | The differencies between orchidee_1_7 and orchidee_1_8 are describe here [wiki:ModelVersions/Diff1_7-1_8 Differences orchidee_1_7-1_8] . |
| 136 | |
| 137 | === differencies between orchidee_1_8 and orchidee_1_9 === |
| 138 | The differencies between orchidee_1_8 and orchidee_1_9 are describe here [wiki:ModelVersions/Diff1_8-1_9 Differences orchidee_1_8-1_9] . |
| 139 | |
| 140 | We describe here the parallel version relative to the sequentiel one. |
| 141 | |
| 142 | === differencies between ORCHIDEE_PARA and orchidee_1_9 === |
| 143 | We only compare here differences relative to parallel implementation in those two versions. |
| 144 | |
| 145 | === differencies between orchidee_1_9 and orchidee_1_9_1 === |
| 146 | Some problems have been corrected in version orchidee_1_9_1 for parallelization. |
| 147 | See this link : [wiki:ModelVersions/Diff1_9-1_9_1 Differences orchidee_1_9-1_9_1]. |
| 148 | |
| 149 | === differencies between orchidee_1_9_1 and orchidee_1_9_2 === |
| 150 | The version orchidee_1_9_1 contains many bugs and should not be used. This link describes those |
| 151 | corrections : [wiki:ModelVersions/Diff1_9_1-1_9_2 Differences orchidee_1_9_1-1_9_2]. |
| 152 | |
| 153 | === differencies between orchidee_1_9_5_1 and orchidee_1_9_5_2 === |
| 154 | You can get this version with modipsl IPSL SCE or by following this web link : |
| 155 | http://forge.ipsl.jussieu.fr/orchidee/browser/tags/ORCHIDEE_1_9_5_2 |
| 156 | |
| 157 | Even if this tag is not completly present in development tree of the model in ORCHIDEE wiki |
| 158 | http://forge.ipsl.jussieu.fr/orchidee/attachment/wiki/WikiStart/arbre_SVN.png, |
| 159 | it is a big step to next ORCHIDEE_1_9_6 major version. |
| 160 | |
| 161 | Since the last ORCHIDEE_1_9_5_1 version, some important parts of the model has been improved, reviewed or corrected : |
| 162 | |
| 163 | 1. The change in units in STOMATE (i.e definition of variables in total m² not m²*veget_max) induced several modifications |
| 164 | in the vegetation dynamics (DGVM) that was not taken into account. [[BR]] |
| 165 | See http://forge.ipsl.jussieu.fr/orchidee/wiki/ReportDgvm for more informations on DGVM corrections.[[BR]] |
| 166 | New DGVM variables have been added in stomate_history file : ADAPTATION, REGENERATION, CN_IND, WOODMASS_IND, ESTABTREE and ESTABGRASS. |
| 167 | 1. New optionnal field_out_names, fields_out, field_in_names, fields_in arrays are given from ORCHIDEE to LMDz.[[BR]] |
| 168 | This modification of the interface has already produce a new version of CMIP5 IPSL couple configuration. |
| 169 | IPSLCM5A_C with 2D couple carbon fluxes. |
| 170 | 1. All ORCHIDEE_OL drivers have been parallelized and cleaned. |
| 171 | 1. Global carbon mass balance has been computed and save with cMassVariation variable in stomate_history |
| 172 | and cBal_lands in MONITORING web site produced with libIGCM scripts for ORCHIDEE (see OOL_SEC_STO directory). |
| 173 | 1. Case of reforestration has been treated with historical (or future) LAND USE activated. |
| 174 | |
| 175 | You can get all the changes between this new version and previous ORCHIDEE_1_9_5_1 tag, following this link : |
| 176 | http://forge.ipsl.jussieu.fr/orchidee/changeset/405/tags/ORCHIDEE_1_9_5_2?old=119&old_path=tags/ORCHIDEE_1_9_5_1 |
| 177 | |
| 178 | == Validations == |
| 179 | |
| 180 | See page ValidateOrchidee. |
| 181 | |