Changeset 257 for branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_soilcarbon.f90

Timestamp:

2011-06-17T14:02:17+02:00 (13 years ago)

Author:

didier.solyga

Message:

Externalized version merged with the trunk

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_soilcarbon.f90 (modified) (5 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_soilcarbon.f90

@@ -112 +112 @@
     frac_carb(:,islow,ipassive) = frac_carb_sp
 
-
     ! 1.1.1.3 from passive pool
 
@@ -118 +117 @@
     frac_carb(:,ipassive,iactive) = frac_carb_pa
     frac_carb(:,ipassive,islow) = frac_carb_ps
-
 
 
@@ -154 +152 @@
     !
 
-    resp_hetero_soil(:,:) = 0.0
+    resp_hetero_soil(:,:) = zero
 
     !
@@ -173 +171 @@
     !
 
-    frac_resp(:,:) = 1. - frac_carb(:,:,iactive) - frac_carb(:,:,islow) - &
+    frac_resp(:,:) = un - frac_carb(:,:,iactive) - frac_carb(:,:,islow) - &
          frac_carb(:,:,ipassive) 
 
@@ -191 +189 @@
              fluxtot(:,k) = dt/carbon_tau(k) * carbon(:,k,m) * &
                   control_moist(:,ibelow) * control_temp(:,ibelow)
-!!$   DS       ELSEIF ( PFT_name(m)=='          C3           agriculture' ) THEN
           ELSEIF ( (.NOT. natural(m)) .AND. (.NOT. is_c4(m)) ) THEN
              fluxtot(:,k) = dt/carbon_tau(k) * carbon(:,k,m) * &
                   control_moist(:,ibelow) * control_temp(:,ibelow) * flux_tot_coeff(1)
-!!$  DS         ELSEIF ( PFT_name(m)=='          C4           agriculture' ) THEN
           ELSEIF ( (.NOT. natural(m)) .AND. is_c4(m) ) THEN
              fluxtot(:,k) = dt/carbon_tau(k) * carbon(:,k,m) * &