Changeset 387

Timestamp:

2011-08-05T16:26:48+02:00 (13 years ago)

Author:

didier.solyga

Message:

Clean code and replace the last 1._r_std by un

Location:

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate

Files:

• lpj_establish.f90 (modified) (2 diffs)
• lpj_light.f90 (modified) (1 diff)
• stomate_litter.f90 (modified) (1 diff)
• stomate_lpj.f90 (modified) (1 diff)
• stomate_phenology.f90 (modified) (2 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/lpj_establish.f90

@@ -465 +465 @@
 
              fpc_nat(:,j) =  MIN(1.0,cn_ind(:,j) * ind(:,j) * & 
-                  MAX( ( 1._r_std - exp( - ext_coeff(j) * lai_ind(:) ) ), min_cover ) )
+                  MAX( ( un - exp( - ext_coeff(j) * lai_ind(:) ) ), min_cover ) )
              !fpc_nat(:,j) = max(fpc_nat(:,j),1.-exp(-0.5*sla(j) * lm_lastyearmax(:,j)))
 
@@ -502 +502 @@
 
                 fpc_nat(:,j) =  cn_ind(:,j) * ind(:,j) * & 
-                     MAX( ( 1._r_std - exp( - ext_coeff(j) * lai_ind(:) ) ), min_cover )
+                     MAX( ( un - exp( - ext_coeff(j) * lai_ind(:) ) ), min_cover )
 
                 d_ind(:,j) = MAX(zero , (1.0-fpc_nat(:,j)) * dt/one_year )

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/lpj_light.f90

@@ -590 +590 @@
              
              fpc_nat(:,j) =  cn_ind(:,j) * ind(:,j) * & 
-                  MAX( ( 1._r_std - exp( - ext_coeff(j) * lai_ind(:) ) ), min_cover )
+                  MAX( ( un - exp( - ext_coeff(j) * lai_ind(:) ) ), min_cover )
              
              WHERE(fpc_nat(:,j).GT.fpc_max(:,j))

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_litter.f90

@@ -665 +665 @@
 
     tempfunc_result(:) = exp( soil_Q10 * ( temp_in(:) - (ZeroCelsius+tsoil_ref)) / Q10 )
-    tempfunc_result(:) = MIN( 1._r_std, tempfunc_result(:) )
+    tempfunc_result(:) = MIN( un, tempfunc_result(:) )
 
   END FUNCTION control_temp_func

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_lpj.f90

@@ -1072 +1072 @@
        bm_to_litter, turnover_daily, &
        harvest_above)
+
     ! 0.1 input
 
     ! Domain size
     INTEGER, INTENT(in)                                            :: npts
-
     ! Time step (days)
     REAL(r_std), INTENT(in)                                         :: dt_days
-
     ! new "maximal" coverage fraction of a PFT (LAI -> infinity) on ground
     REAL(r_std), DIMENSION(npts,nvm), INTENT(in)                 :: veget_max
+
     ! 0.2 modified fields
-
     ! fractional coverage on natural/agricultural ground, taking into
     !   account LAI (=grid-scale fpc)
     REAL(r_std), DIMENSION(npts,nvm), INTENT(inout)                    :: veget
-
     ! conversion of biomass to litter (gC/(m**2 of nat/agri ground)) / day
     REAL(r_std), DIMENSION(npts,nvm,nparts), INTENT(inout)           :: bm_to_litter
-
     ! Turnover rates (gC/(m**2 of ground)/day)
     REAL(r_std), DIMENSION(npts,nvm,nparts), INTENT(inout)          :: turnover_daily
     ! harvest above ground biomass for agriculture
     REAL(r_std), DIMENSION(npts), INTENT(inout)                       :: harvest_above
+
     ! 0.4 local
 
     ! indices
     INTEGER(i_std)                                                     :: i, j, k, l, m
-
     ! biomass increase (gC/(m**2 of ground))
     REAL(r_std)                                                        :: above_old
+
     ! yearly initialisation
     above_old             = zero

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_phenology.f90

@@ -160 +160 @@
     !
 
-    allow_initpheno(:,ibare_sechiba) = .FALSE. 
+    allow_initpheno(:,1) = .FALSE.
     DO j = 2,nvm
 
@@ -195 +195 @@
     ! different kinds of phenology
     
-    ! used in all the differents models of phenology DS 17112010
+    ! parameter used in all the differents models of phenology 
     t_always = ZeroCelsius + t_always_add