Changeset 311 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/hydrolc.f90

Timestamp:

2011-07-08T14:24:28+02:00 (13 years ago)

Author:

didier.solyga

Message:

Move and clean the rest of the externalized parameters from sechiba and stomate to src_parameters. Add two subroutines in constantes. Correct Olson type number 79 in vegcorr

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/hydrolc.f90 (modified) (5 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/hydrolc.f90

@@ -40 +40 @@
   !
   LOGICAL, SAVE                                     :: check_waterbal=.FALSE. !! The check the water balance
-  LOGICAL, SAVE                                     :: ok_hdiff         !! do horizontal diffusion?
 
   CHARACTER(LEN=80) , SAVE                          :: var_name         !! To store variables names for I/O
@@ -175 +174 @@
     IF (l_first_hydrol) THEN
 
-       sneige = snowcri/mille
-
         IF (long_print) WRITE (numout,*) ' l_first_hydrol : call hydrolc_init '
 
@@ -450 +447 @@
     ENDIF
 
-    !Config  Key  = HYDROL_OK_HDIFF
-    !Config  Desc = do horizontal diffusion?
-    !Config  Def  = n
-    !Config  Help = If TRUE, then water can diffuse horizontally between
-    !Config         the PFTs' water reservoirs.
- 
-    ok_hdiff = .FALSE.
-    CALL getin_p('HYDROL_OK_HDIFF',ok_hdiff) 
+    ! >> july 2011 add initialisation of sneige and throughfall_by_pft
+    sneige = snowcri/mille
+    throughfall_by_pft = throughfall_by_pft / 100.   
 
     ! make dynamic allocation with good dimension
@@ -854 +846 @@
         zdsp(:,:) = dpu_cste - bqsb(:,:) / mx_eau_eau
         dsp(1,1) = val_exp
-        call getin_p('HYDROL_DSP', dsp(1,1))
+        CALL getin_p('HYDROL_DSP', dsp(1,1))
         IF (dsp(1,1) == val_exp) THEN
            dsp(:,:) = zdsp(:,:)
@@ -1458 +1450 @@
     INTEGER(i_std)                                :: ji, jv
     REAL(r_std), DIMENSION (kjpindex,nvm)          :: zqsintvegnew
-    LOGICAL, SAVE                                  :: firstcall=.TRUE.
-
-    IF ( firstcall ) THEN
-
-       throughfall_by_pft = throughfall_by_pft / 100.
-
-       firstcall=.FALSE.
-    ENDIF
+!!$    LOGICAL, SAVE                                  :: firstcall=.TRUE.
+!!$
+!!$    IF ( firstcall ) THEN
+!!$
+!!$       throughfall_by_pft = throughfall_by_pft / 100.
+!!$
+!!$       firstcall=.FALSE.
+!!$    ENDIF
 
     ! calcul de qsintmax a prevoir a chaque pas de temps