Changeset 277 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/slowproc.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/slowproc.f90 (modified) (8 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/slowproc.f90

@@ -3 +3 @@
 !
 !< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE/src_sechiba/slowproc.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
@@ -78 +78 @@
        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)
 
 
@@ -117 +117 @@
     ! output fields
     REAL(r_std), DIMENSION (kjpindex,nvm), INTENT(out)      :: co2_flux         !! CO2 flux in gC/m**2 of average ground/second
+    REAL(r_std),DIMENSION (kjpindex), INTENT (out)          :: fco2_lu          !! Land Cover Change CO2 flux (gC/m**2 of average ground/s)
     ! modified scalar
     ! modified fields
@@ -190 +191 @@
                veget_nextyear, totfrac_nobio_nextyear, &
                hist_id, hist2_id, rest_id_stom, hist_id_stom, hist_id_stom_IPCC, &
-               co2_flux,resp_maint,resp_hetero,resp_growth)
+               co2_flux, fco2_lu, resp_maint,resp_hetero,resp_growth)
           !
        ENDIF
@@ -286 +287 @@
                veget_nextyear, totfrac_nobio_nextyear, &
                hist_id, hist2_id, rest_id_stom, hist_id_stom, hist_id_stom_IPCC, &
-               co2_flux,resp_maint,resp_hetero,resp_growth)
+               co2_flux, fco2_lu, resp_maint,resp_hetero,resp_growth)
        ENDIF
 
@@ -384 +385 @@
             veget_nextyear, totfrac_nobio_nextyear, &
             hist_id, hist2_id, rest_id_stom, hist_id_stom, hist_id_stom_IPCC, &
-            co2_flux,resp_maint,resp_hetero,resp_growth)
+            co2_flux, fco2_lu, resp_maint,resp_hetero,resp_growth)
        IF ( control%ok_stomate .AND. control%ok_sechiba ) THEN
           CALL histwrite(hist_id, 'maint_resp', kjit, resp_maint, kjpindex*nvm, indexveg)
@@ -756 +757 @@
     CALL getin_p ("HYDROL_SOIL_DEPTH", dpu_cste)
     dpu(:)=dpu_cste
-    !
-    !Config Key  = HYDROL_HUMCSTE
-    !Config Desc = Root profile
-    !Config Def  = 5., .8, .8, 1., .8, .8, 1., 1., .8, 4., 4., 4., 4.
-    !Config Help = Default values were defined for 2 meters soil depth.
-    !Config        For 4 meters soil depth, you may use those ones :
-    !Config        5., .4, .4, 1., .8, .8, 1., 1., .8, 4., 1., 4., 1.
-    !
-!    humcste(:)= &
-!         & (/5., .8, .8, 1., .8, .8, 1., 1., .8, 4., 4., 4., 4./)
-!!$    CALL getin_p ("HYDROL_HUMCSTE", humcste)
-
 !MM, T. d'O. : before in constantes_soil :
 !          diaglev = &
@@ -2917 +2906 @@
     !
     IF (MAXVAL(vegmap) .LT. nolson) THEN
-      WRITE(*,*) 'WARNING -- WARNING'
-      WRITE(*,*) 'The vegetation map has to few vegetation types.'
-      WRITE(*,*) 'If you are lucky it will work but please check'
+       WRITE(*,*) 'WARNING -- WARNING'
+       WRITE(*,*) 'The vegetation map has to few vegetation types.'
+       WRITE(*,*) 'If you are lucky it will work but please check'
     ELSE IF ( MAXVAL(vegmap) .GT. nolson) THEN
-      WRITE(*,*) 'More vegetation types in file than the code can'
-      WRITE(*,*) 'deal with.: ',  MAXVAL(vegmap),  nolson
-      STOP 'slowproc_interpol'
+       WRITE(*,*) 'More vegetation types in file than the code can'
+       WRITE(*,*) 'deal with.: ',  MAXVAL(vegmap),  nolson
+       STOP 'slowproc_interpol'
     ENDIF
     !