Changeset 277 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/sechiba.f90

Timestamp:

2011-06-23T11:25:25+02:00 (13 years ago)

Author:

didier.solyga

Message:

Update the externalized version with the last commit of the trunk (revision 275)

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/sechiba.f90 (modified) (6 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/sechiba.f90

@@ -4 +4 @@
 !!
 !! @author Marie-Alice Foujols and Jan Polcher
-!! @Version : $Revision: 45 $, $Date: 2011-01-01 21:30:44 +0100 (Sat, 01 Jan 2011) $
+!! @Version : $Revision: 275 $, $Date: 2011-06-21 15:28:18 +0200 (Tue, 21 Jun 2011) $
 !! 
 !< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE/src_sechiba/sechiba.f90 $
-!< $Date: 2011-01-01 21:30:44 +0100 (Sat, 01 Jan 2011) $
-!< $Author: mmaipsl $
-!< $Revision: 45 $
+!< $Date: 2011-06-21 15:28:18 +0200 (Tue, 21 Jun 2011) $
+!< $Author: martial.mancip $
+!< $Revision: 275 $
 !! IPSL (2006)
 !!  This software is governed by the CeCILL licence see ORCHIDEE/ORCHIDEE_CeCILL.LIC
@@ -186 +186 @@
     & precip_rain, precip_snow, lwdown, swnet, swdown, pb, &
          ! Output : Fluxes
-    & vevapp, fluxsens, fluxlat, coastalflow, riverflow, &
+    & vevapp, fluxsens, fluxlat, coastalflow, riverflow, netco2flux, fco2_lu, &
          ! Surface temperatures and surface properties
     & tsol_rad, temp_sol_new, qsurf_out, albedo_out, emis_out, z0_out, &
@@ -249 +249 @@
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: fluxlat          !! Latent chaleur flux
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: emis_out         !! Emissivity
+    REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: netco2flux       !! Sum CO2 flux over PFTs (gC/m**2 of average ground/s)
+    REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: fco2_lu          !! Land Cover Change CO2 flux (gC/m**2 of average ground/s)
 
     REAL(r_std), ALLOCATABLE, DIMENSION (:)                  :: runoff1,drainage1, soilcap1,soilflx1
@@ -322 +324 @@
             lai, height, veget, frac_nobio, veget_max, totfrac_nobio, qsintmax, &
             rest_id, hist_id, hist2_id, rest_id_stom, hist_id_stom, hist_id_stom_IPCC, &
-            co2_flux)
+            co2_flux, fco2_lu)
+       netco2flux(:) = zero
+       DO jv = 2,nvm
+          netco2flux(:) = netco2flux(:) + co2_flux(:,jv)*veget_max(:,jv)
+       ENDDO
        ! 
        ! computes initialisation of diffusion coeff
@@ -570 +576 @@
          lai, height, veget, frac_nobio, veget_max, totfrac_nobio, qsintmax, &
          rest_id, hist_id, hist2_id, rest_id_stom, hist_id_stom, hist_id_stom_IPCC, &
-         co2_flux)
-
+         co2_flux, fco2_lu)
+    !
+    ! Compute global CO2 flux
+    !
+    netco2flux(:) = zero
+    DO jv = 2,nvm
+       netco2flux(:) = netco2flux(:) + co2_flux(:,jv)*veget_max(:,jv)
+    ENDDO
     !
     ! call swap from new computed variables  
@@ -831 +843 @@
             lai, height, veget, frac_nobio, veget_max, totfrac_nobio, qsintmax, &
             rest_id, hist_id, hist2_id, rest_id_stom, hist_id_stom, hist_id_stom_IPCC, &
-            co2_flux)
-
+            co2_flux, fco2_lu)
+       netco2flux(:) = zero
+       DO jv = 2,nvm
+          netco2flux(:) = netco2flux(:) + co2_flux(:,jv)*veget_max(:,jv)
+       ENDDO
 
        var_name= 'shumdiag'