Changeset 285

Timestamp:

2011-07-01T14:29:29+02:00 (13 years ago)

Author:

didier.solyga

Message:

Correct teststomate : add arguments fco2_lu and control_flags because of modifications of stom_define_history in intersurf.f90 and slowproc_main in slowproc.f90

File:

• branches/ORCHIDEE_EXT/ORCHIDEE_OL/teststomate.f90 (modified) (6 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE_OL/teststomate.f90

@@ -56 +56 @@
   REAL(r_std),DIMENSION(:),ALLOCATABLE      :: hist_PFTaxis
 !!$ >>  DS
+!!$ >> Add for correct 1.9.5.1 version 01/07/2011
+  TYPE(control_type), SAVE                  :: control_flags 
+  REAL(r_std),DIMENSION(:),ALLOCATABLE      :: fco2_lu 
+!!$>> DS
 
 
@@ -192 +196 @@
   ALLOCATE (hist_PFTaxis(nvm),stat=ier)
   a_er = a_er .OR. (ier.NE.0)
+! 01/07/2011 allocate fco2_lu
+  ALLOCATE (fco2_lu(kjpindex),stat=ier)
+  a_er = a_er .OR. (ier.NE.0)  
 !!$ end add DS
   ALLOCATE (indices(kjpindex),stat=ier)
@@ -509 +516 @@
  & dt_files, hist_dt_stom, hori_id, hist_PFTaxis_id, &
  & hist_pool_10axis_id, hist_pool_100axis_id, &
- & hist_pool_11axis_id, hist_pool_101axis_id)
+ & hist_pool_11axis_id, hist_pool_101axis_id,control_flags)
 ! end definition
   CALL histend(hist_id_sto)
@@ -557 +564 @@
  &   deadleaf_cover, assim_param_x, lai_x, height_x, veget_x, &
  &   frac_nobio, veget_max_x, totfrac_nobio, qsintmax_x, &
- &   rest_id_sec, hist_id_sec, hist_id_sec2, rest_id_sto, hist_id_sto, hist_id_stom_IPCC, co2_flux)
+ &   rest_id_sec, hist_id_sec, hist_id_sec2, rest_id_sto, hist_id_sto, hist_id_stom_IPCC, co2_flux, &
+!!>> DS add 01/07/2011 correction due to some modifications in the trunk
+ &  fco2_lu)
   ! correct date
   day_counter = one_day - dt_force
@@ -809 +818 @@
  &     deadleaf_cover, assim_param_x, lai_x, height_x, veget_x, &
  &     frac_nobio, veget_max_x, totfrac_nobio, qsintmax_x, &
- &     rest_id_sec, hist_id_sec, hist_id_sec2, rest_id_sto, hist_id_sto, hist_id_stom_IPCC, co2_flux)
+ &     rest_id_sec, hist_id_sec, hist_id_sec2, rest_id_sto, hist_id_sto, hist_id_stom_IPCC, co2_flux, &
+!!>> DS add 01/07/2011 correction due to some modifications in the trunk
+ &     fco2_lu)
     day_counter = one_day - dt_force
   ENDDO ! end of the time loop
@@ -882 +893 @@
  &   deadleaf_cover, assim_param_x, lai_x, height_x, veget_x, &
  &   frac_nobio, veget_max_x, totfrac_nobio, qsintmax_x, &
- &   rest_id_sec, hist_id_sec, hist_id_sec2, rest_id_sto, hist_id_sto, hist_id_stom_IPCC, co2_flux)
+ &   rest_id_sec, hist_id_sec, hist_id_sec2, rest_id_sto, hist_id_sto, hist_id_stom_IPCC, co2_flux, &
+!!>> DS add 01/07/2011 correction due to some modifications in the trunk
+ &   fco2_lu)
+
 !-
 ! close files