Changes between Version 1 and Version 2 of trunk/ValidHydroIntoTrunk

Timestamp:

2012-07-26T16:10:02+02:00 (12 years ago)

Author:

jgipsl

Comment:

--

trunk/ValidHydroIntoTrunk

@@ +1 @@
+[[PageOutline]]
 = Validation of the merge of Hydrology branch into the trunk =
-
-
-
-== Merge into the trunk (rev 941) (Didier Solyga) == 
+The developpements on the Hydrology branch(rev 941) has been integrated in the trunk in [http://forge.ipsl.jussieu.fr/orchidee/changeset/947 revsion 947]. Validations are on going. Commit [http://forge.ipsl.jussieu.fr/orchidee/changeset/944 revison 944] on the Hydrology branch needs to be validated before inclusion in the trunk.
+
+= Simulations =
+== Offline ==
+Run in standard set up, by Didier, seems to be correct between the tag 1.9.6, the Hydrology branch and the new trunk. 
+
+ 
+In Fabienne's set up there is a problem in the C4 grass. See offline simulations at obelix /home/satellites5/maignan/ORCHIDEE/HYDRO/RUN_ERAI_SEC/Readme.txt for more information.
+
+== LMDZ-ORCHIDEE ==
+Josefine
+The routing does not work in coupled mode. 
+
+'''Without routing'''[[BR]]
+Some shorter test can be found at gaya/IDRIS here /u/rech/dzt/rdzt893/IGCM_OUT/LMDZOR/TEST/valortrunk
+
+'''With routing'''[[BR]]
+
+Using the old subroutine routing_basins from tag 1.9.5 (same as 1.9.6) it is possible to run in coupled mode. Test for 3 years can be found at gaya/IDRIS here  /u/rech/dzt/rdzt893/IGCM_OUT/LMDZOR/TEST/ValidWithRoutage
+
+
+ 
+= Merge into the trunk (rev 941) (Didier Solyga) =
 This section lists the modifications needed to merge the DOC/Hydro branch into the trunk :
 
@@ -102 +122 @@
   * '''MERGE DONE ''': Merge Hydrology(+Doc) branch revision 932 into trunk revision 945. Done on 19/07/2012 look at [947].
 
-  === Differences explaining the differences between the trunk and the Hydrology branch : ===
+= Differences explaining the differences between the trunk and the Hydrology branch =
     
   * Initialization of lai : in the branch (and tag 196), the lai is initialized twice if we have no restart files, once in slowproc_lai, the second time in stomate.f90. In slowproc_lai, the lai is non-zero :
@@ -171 +191 @@
  * The CMOR outputs mrros, mrr, prveg, evspsblveg, evspsblsoi, tran have been corrected in the trunk (see ticket #9). Set SECHIBA_HIST_LEVEL to 10 to not activate them.
 
-  === Differences explaining the differences between the trunk and the tag 196 : ===
+= Differences explaining the differences between the trunk and the tag 196  =
   * In tag 196, when IMPOSE_VEG is activated veget is not calculated by the subroutine slowproc_veget. So as we have veget=veget_max, no fraction of bare soil is calculated. 
   * In trunk (rev [947]), veget(:,1) is replaced by tot_frac_bare and slowproc_veget is called whatever the case. So a fraction is always calculated even in IMPOSE_VEG. This modification implies a modification of the value of z0 (and albedo). To have the same results, a call to slowproc_veget should be added in the tag version of slowproc  :