Changeset 111 for branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters

Timestamp:

2011-02-16T11:05:09+01:00 (14 years ago)

Author:

didier.solyga

Message:

Move some calls to sechiba_parameters which were in stomate_parameters, clean the code from old comments

Location:

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters

Files:

• constantes.f90 (modified) (2 diffs)
• pft_parameters.f90 (modified) (4 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/constantes.f90

@@ -1033 +1033 @@
    CALL getin('DMCR',dmcr)
    !-
+   CALL getin('VIS_DRY',vis_dry)
+   CALL getin('NIR_DRY',nir_dry)
+   CALL getin('VIS_WET',vis_wet)
+   CALL getin('NIR_WET',nir_wet)
+   CALL getin('ALBSOIL_VIS',albsoil_vis)
+   CALL getin('ALBSOIL_NIR',albsoil_nir)
    !-
    CALL getin('CLAYFRACTION_DEFAULT',clayfraction_default)
@@ -1205 +1211 @@
        CALL getin('LEAFAGE_OLD',leafage_old)
        !-
-       CALL getin('VIS_DRY',vis_dry)
-       CALL getin('NIR_DRY',nir_dry)
-       CALL getin('VIS_WET',vis_wet)
-       CALL getin('NIR_WET',nir_wet)
-       CALL getin('ALBSOIL_VIS',albsoil_vis)
-       CALL getin('ALBSOIL_NIR',albsoil_nir)
-       !-
        CALL getin('GPPFRAC_DORMANCE',gppfrac_dormance)
        CALL getin('MIN_GPP_ALLOWED',min_gpp_allowed)

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/pft_parameters.f90

@@ -375 +375 @@
   !----------------------------------
   !
-  ! used in hydrolc
+  ! used in hydrolc and hydrol
   REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:)   :: throughfall_by_pft
   ! used in diffuco   !! Nathalie le 28 mars 2006 - sur proposition de Fred Hourdin, ajout
@@ -456 +456 @@
 
       !------------------------------------------------------!
-      ! Declaration of tables 2D  which are used in the code !
+      ! Initialisation of tables 2D  which are used in the code !
       !------------------------------------------------------!
       !
       !- pheno_gdd_crit
       pheno_gdd_crit(:,:) = zero 
-!!$      pheno_gdd_crit(:,1) = pheno_gdd_crit_c(:)
-!!$      pheno_gdd_crit(:,2) = pheno_gdd_crit_b(:)         
-!!$      pheno_gdd_crit(:,3) = pheno_gdd_crit_a(:) 
       !
       !- senescence_temp
       senescence_temp(:,:) = zero
-!!$      senescence_temp(:,1) = senescence_temp_c(:)
-!!$      senescence_temp(:,2) = senescence_temp_b(:)
-!!$      senescence_temp(:,3) = senescence_temp_a(:)
       !
       !- maint_resp_slope
       maint_resp_slope(:,:) = zero
-!!$      maint_resp_slope(:,1)= maint_resp_slope_c(:)              
-!!$      maint_resp_slope(:,2) = maint_resp_slope_b(:)
-!!$      maint_resp_slope(:,3) = maint_resp_slope_a(:)
       !
       !-coeff_maint_zero
       coeff_maint_zero(:,:) = zero
-!!$      coeff_maint_zero(:,ileaf) = cm_zero_leaf(:)
-!!$      coeff_maint_zero(:,isapabove) = cm_zero_sapabove(:)
-!!$      coeff_maint_zero(:,isapbelow) = cm_zero_sapbelow(:)
-!!$      coeff_maint_zero(:,iheartabove) = cm_zero_heartabove(:)
-!!$      coeff_maint_zero(:,iheartbelow) = cm_zero_heartbelow(:)
-!!$      coeff_maint_zero(:,iroot) = cm_zero_root(:)
-!!$      coeff_maint_zero(:,ifruit) = cm_zero_fruit(:)
-!!$      coeff_maint_zero(:,icarbres) = cm_zero_carbres(:)
       !
       !-alb_leaf
       alb_leaf(:) = zero
-!!$      alb_leaf(1:nvm) = alb_leaf_vis(1:nvm)
-!!$      DO i = nvm+1, 2*nvm
-!!$         alb_leaf(i) = alb_leaf_nir(i-nvm)
-!!$      ENDDO
       !- pref_soil_veg (see slowproc)
 
@@ -1238 +1217 @@
      ! No calling to getin for
      ! veget_ori_fixed_test_1, llaimax and height_presc
-     ! getin will be called in slowproc.f90
+     ! use of setvar in slowproc.f90
      
      !-----------------
@@ -1260 +1239 @@
      CALL getin('KZERO',kzero)
      CALL getin('RVEG_PFT', rveg_pft)    
-     !-------------------
-     ! Water - sechiba
-     !-------------------
+     !---------------------------
+     ! Water-hydrology - sechiba
+     !---------------------------
      !
      CALL getin('WMAX_VEG',wmax_veg)
-     CALL getin("HYDROL_HUMCSTE", humcste)
-     ! humcste is called in slowproc.f90 (problem with the flag)
+     CALL getin('HYDROL_HUMCSTE', humcste)
+     CALL getin('PERCENT_TROUGHFALL_PFT',throughfall_by_pft)
      !------------------
      ! Albedo - sechiba