Changeset 108

Timestamp:

2011-02-11T15:27:45+01:00 (13 years ago)

Author:

didier.solyga

Message:

Replace the test by PFT_name by more general test for the computation of fluxtot

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_soilcarbon.f90 (modified) (1 diff)

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_soilcarbon.f90

@@ -191 +191 @@
              fluxtot(:,k) = dt/carbon_tau(k) * carbon(:,k,m) * &
                   control_moist(:,ibelow) * control_temp(:,ibelow)
-          ELSEIF ( PFT_name(m)=='          C3           agriculture' ) THEN
+!!$   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)
-          ELSEIF ( PFT_name(m)=='          C4           agriculture' ) THEN
+!!$  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) * &
                   control_moist(:,ibelow) * control_temp(:,ibelow) * flux_tot_coeff(2)