Changeset 482


Ignore:
Timestamp:
2011-09-23T13:40:52+02:00 (11 years ago)
Author:
didier.solyga
Message:

Simplification of the code : delete the pft parameter alb_leaf. Use alb_leaf_vis and alb_leaf_nir instead of alb_leaf

Location:
branches/ORCHIDEE_EXT/ORCHIDEE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/pft_parameters.f90

    r471 r482  
    120120  ! leaf albedo of vegetation type, near infrared albedo 
    121121  REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:) :: alb_leaf_nir 
    122   ! leaf albedo of vegetation type, VIS+NIR 
    123   REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:) :: alb_leaf 
    124122 
    125123 
     
    491489      !- pref_soil_veg  
    492490      pref_soil_veg(:,:) = zero_int 
    493  
    494       IF (active_flags%ok_sechiba) THEN 
    495          !-alb_leaf 
    496          alb_leaf(:) = zero 
    497       ENDIF 
    498491 
    499492      IF (active_flags%ok_stomate) THEN 
     
    842835      ALLOCATE(alb_leaf_nir(nvm),stat=ier) 
    843836      l_error = l_error .OR. (ier .NE. 0) 
    844       ALLOCATE(alb_leaf(2*nvm),stat=ier) 
    845       l_error = l_error .OR. (ier .NE. 0) 
    846837   ENDIF 
    847838 
     
    19271918   IF(ALLOCATED(alb_leaf_vis))DEALLOCATE(alb_leaf_vis) 
    19281919   IF(ALLOCATED(alb_leaf_nir))DEALLOCATE(alb_leaf_nir)    
    1929    IF(ALLOCATED(alb_leaf))DEALLOCATE(alb_leaf) 
    19301920   !- 
    19311921   IF(ALLOCATED(leaf_tab))DEALLOCATE(leaf_tab) 
  • branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/condveg.f90

    r386 r482  
    10511051    INTEGER(i_std)                                   :: ks, jv 
    10521052    ! 
    1053 !!$    DS :Correction 11/02/2011 : update 2D parameters  
    1054     alb_leaf(1:nvm) = alb_leaf_vis(:) 
    1055     alb_leaf(nvm+1:2*nvm) = alb_leaf_nir(:) 
    1056     ! 
    1057     alb_leaf_tmp(:,1) = alb_leaf(1:nvm) 
    1058     alb_leaf_tmp(:,2) = alb_leaf(nvm+1:2*nvm) 
     1053    !>> DS 23/09/2011 alb_leaf is not used anymore replaced by alb_leaf_nis and alb_leaf_nir 
     1054    ! 
     1055    alb_leaf_tmp(:,ivis) = alb_leaf_vis(:) 
     1056    alb_leaf_tmp(:,inir) = alb_leaf_nir(:) 
    10591057    ! 
    10601058    ! 
Note: See TracChangeset for help on using the changeset viewer.