Changeset 257 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/sechiba.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_sechiba/sechiba.f90 (modified) (7 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/sechiba.f90

@@ -4 +4 @@
 !!
 !! @author Marie-Alice Foujols and Jan Polcher
-!! @Version : $Revision: 1.46 $, $Date: 2010/05/07 08:28:13 $
+!! @Version : $Revision: 45 $, $Date: 2011-01-01 21:30:44 +0100 (Sat, 01 Jan 2011) $
 !! 
-!! $Header: /home/ssipsl/CVSREP/ORCHIDEE/src_sechiba/sechiba.f90,v 1.46 2010/05/07 08:28:13 ssipsl Exp $
+!< $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 $
 !! IPSL (2006)
 !!  This software is governed by the CeCILL licence see ORCHIDEE/ORCHIDEE_CeCILL.LIC
@@ -239 +242 @@
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: tsol_rad         !! Radiative surface temperature
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: vevapp           !! Total of evaporation
-    REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: temp_sol_new     !! New soil temperature
+    REAL(r_std),DIMENSION (kjpindex), INTENT (inout)           :: temp_sol_new     !! New soil temperature
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: qsurf_out        !! Surface specific humidity
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)           :: z0_out           !! Surface roughness (output diagnostic)
@@ -256 +259 @@
     REAL(r_std), DIMENSION(kjpindex) :: sum_treefrac, sum_grassfrac, sum_cropfrac
     INTEGER(i_std) :: jv
-
-
-
 
     IF (long_print) WRITE(numout,*) ' kjpindex =',kjpindex
@@ -636 +636 @@
        ENDIF
 
-       histvar(:)=SUM(vevapwet(:,:),dim=2)/86400
+       histvar(:)=SUM(vevapwet(:,:),dim=2)/one_day
        CALL histwrite(hist_id, 'evspsblveg', kjit, histvar, kjpindex, index)
 
-       histvar(:)=(vevapnu(:)+vevapsno(:))/86400
+       histvar(:)=(vevapnu(:)+vevapsno(:))/one_day
        CALL histwrite(hist_id, 'evspsblsoi', kjit, histvar, kjpindex, index)
 
-       histvar(:)=SUM(transpir(:,:),dim=2)/86400
+       histvar(:)=SUM(transpir(:,:),dim=2)/one_day
        CALL histwrite(hist_id, 'tran', kjit, histvar, kjpindex, index)
-
-!------------------------------------
-
-!       histvar(:)=SUM(veget_max(:,2:9),dim=2)*100*contfrac(:)
-!       CALL histwrite(hist_id, 'treeFrac', kjit, histvar, kjpindex, index)
-
-!       histvar(:)=SUM(veget_max(:,10:11),dim=2)*100*contfrac(:)
-!       CALL histwrite(hist_id, 'grassFrac', kjit, histvar, kjpindex, index)
-
-!       histvar(:)=SUM(veget_max(:,12:13),dim=2)*100*contfrac(:)
-!       CALL histwrite(hist_id, 'cropFrac', kjit, histvar, kjpindex, index)
 
 !$$ 25/10/10 Modif DS & NViovy
@@ -666 +655 @@
        histvar(:)= sum_cropfrac(:)*100*contfrac(:)
        CALL histwrite(hist_id, 'cropFrac', kjit, histvar, kjpindex, index)
-
 
        histvar(:)=veget_max(:,1)*100*contfrac(:)
@@ -1347 +1335 @@
     ENDDO
 
-
     !
     ! 2. restart value
@@ -1372 +1359 @@
     !
 
+    control%river_routing = control_in%river_routing
+    control%hydrol_cwrr = control_in%hydrol_cwrr
     control%ok_co2 = control_in%ok_co2
     control%ok_sechiba = control_in%ok_sechiba