Changeset 482

Timestamp:

2011-09-23T13:40:52+02:00 (13 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:

• src_parameters/pft_parameters.f90 (modified) (4 diffs)
• src_sechiba/condveg.f90 (modified) (1 diff)

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/pft_parameters.f90

@@ -120 +120 @@
   ! leaf albedo of vegetation type, near infrared albedo
   REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:) :: alb_leaf_nir
-  ! leaf albedo of vegetation type, VIS+NIR
-  REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:) :: alb_leaf
 
 
@@ -491 +489 @@
       !- pref_soil_veg 
       pref_soil_veg(:,:) = zero_int
-
-      IF (active_flags%ok_sechiba) THEN
-         !-alb_leaf
-         alb_leaf(:) = zero
-      ENDIF
 
       IF (active_flags%ok_stomate) THEN
@@ -842 +835 @@
       ALLOCATE(alb_leaf_nir(nvm),stat=ier)
       l_error = l_error .OR. (ier .NE. 0)
-      ALLOCATE(alb_leaf(2*nvm),stat=ier)
-      l_error = l_error .OR. (ier .NE. 0)
    ENDIF
 
@@ -1927 +1918 @@
    IF(ALLOCATED(alb_leaf_vis))DEALLOCATE(alb_leaf_vis)
    IF(ALLOCATED(alb_leaf_nir))DEALLOCATE(alb_leaf_nir)   
-   IF(ALLOCATED(alb_leaf))DEALLOCATE(alb_leaf)
    !-
    IF(ALLOCATED(leaf_tab))DEALLOCATE(leaf_tab)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/condveg.f90

@@ -1051 +1051 @@
     INTEGER(i_std)                                   :: ks, jv
     !
-!!$    DS :Correction 11/02/2011 : update 2D parameters 
-    alb_leaf(1:nvm) = alb_leaf_vis(:)
-    alb_leaf(nvm+1:2*nvm) = alb_leaf_nir(:)
-    !
-    alb_leaf_tmp(:,1) = alb_leaf(1:nvm)
-    alb_leaf_tmp(:,2) = alb_leaf(nvm+1:2*nvm)
+    !>> DS 23/09/2011 alb_leaf is not used anymore replaced by alb_leaf_nis and alb_leaf_nir
+    !
+    alb_leaf_tmp(:,ivis) = alb_leaf_vis(:)
+    alb_leaf_tmp(:,inir) = alb_leaf_nir(:)
     !
     !