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

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/hydrol.f90

@@ -3 +3 @@
 !!
 !! @author Marie-Alice Foujols and Jan Polcher
-!! @Version : $Revision: 1.36 $, $Date: 2009/01/07 13:39:45 $
+!! @Version : $Revision: 45 $, $Date: 2011-01-01 21:30:44 +0100 (Sat, 01 Jan 2011) $
 !!
-!! $Header: /home/ssipsl/CVSREP/ORCHIDEE/src_sechiba/hydrol.f90,v 1.36 2009/01/07 13:39:45 ssipsl Exp $
+!< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE/src_sechiba/hydrol.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
@@ -224 +227 @@
     !! We consider that any water on the ice is snow and we only peforme a water balance to have consistency.
     !! The water balance is limite to + or - 10^6 so that accumulation is not endless
+    REAL(r_std),DIMENSION (kjpindex), INTENT (inout)     :: runoff           !! Complete runoff
+    REAL(r_std),DIMENSION (kjpindex), INTENT (inout)     :: drainage         !! Drainage
+    REAL(r_std),DIMENSION (kjpindex,nbdl), INTENT (inout):: shumdiag         !! relative soil moisture
     ! output fields
-    REAL(r_std),DIMENSION (kjpindex), INTENT (out)     :: runoff           !! Complete runoff
-    REAL(r_std),DIMENSION (kjpindex), INTENT (out)     :: drainage         !! Drainage
     REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (out) :: humrel           !! Relative humidity
     REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (out) :: vegstress        !! Veg. moisture stress (only for vegetation growth)
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)     :: drysoil_frac     !! function of litter wetness
-    REAL(r_std),DIMENSION (kjpindex,nbdl), INTENT (out):: shumdiag         !! relative soil moisture
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)     :: litterhumdiag    !! litter humidity
     REAL(r_std),DIMENSION (kjpindex), INTENT (out)     :: tot_melt         !! Total melt    
@@ -1082 +1085 @@
        !
        DO jsl=1,nslm
-          CALL setvar_p (us(:,:,:,jsl), val_exp, 'US_INIT', 0.0_r_std)
+          CALL setvar_p (us(:,:,:,jsl), val_exp, 'US_INIT', zero)
        ENDDO
        !
@@ -1101 +1104 @@
        !Config        started without a restart file.
        !
-       CALL setvar_p (ae_ns, val_exp, 'EVAPNU_SOIL', 0.0_r_std)
+       CALL setvar_p (ae_ns, val_exp, 'EVAPNU_SOIL', zero)
        !
        !Config Key  = HYDROL_SNOW
@@ -1110 +1113 @@
        !Config        started without a restart file.
        !
-       CALL setvar_p (snow, val_exp, 'HYDROL_SNOW', 0.0_r_std)
+       CALL setvar_p (snow, val_exp, 'HYDROL_SNOW', zero)
        !
        !Config Key  = HYDROL_SNOWAGE
@@ -1119 +1122 @@
        !Config        started without a restart file.
        !
-       CALL setvar_p (snow_age, val_exp, 'HYDROL_SNOWAGE', 0.0_r_std)
+       CALL setvar_p (snow_age, val_exp, 'HYDROL_SNOWAGE', zero)
        !
        !Config Key  = HYDROL_SNOW_NOBIO
@@ -1128 +1131 @@
        !Config        started without a restart file.
        !
-       CALL setvar_p (snow_nobio, val_exp, 'HYDROL_SNOW_NOBIO', 0.0_r_std)
+       CALL setvar_p (snow_nobio, val_exp, 'HYDROL_SNOW_NOBIO', zero)
        !
        !Config Key  = HYDROL_SNOW_NOBIO_AGE
@@ -1137 +1140 @@
        !Config        started without a restart file.
        !
-       CALL setvar_p (snow_nobio_age, val_exp, 'HYDROL_SNOW_NOBIO_AGE', 0.0_r_std)
+       CALL setvar_p (snow_nobio_age, val_exp, 'HYDROL_SNOW_NOBIO_AGE', zero)
        !
        !
@@ -1148 +1151 @@
        !Config        the model is started without a restart file. 
        !
-       CALL setvar_p (qsintveg, val_exp, 'HYDROL_QSV', 0.0_r_std)
+       CALL setvar_p (qsintveg, val_exp, 'HYDROL_QSV', zero)
        !
        ! There is no need to configure the initialisation of resdist. If not available it is the vegetation map
@@ -1717 +1720 @@
           IF (snow(ji).GT.sneige) THEN
              !
-             snowmelt(ji) = (1. - frac_nobio(ji,iice))*(temp_sol_new(ji) - tp_00) * soilcap(ji) / chalfu0
+             snowmelt(ji) = (un - frac_nobio(ji,iice))*(temp_sol_new(ji) - tp_00) * soilcap(ji) / chalfu0
              !
              ! 1.3.1.1 enough snow for melting or not
@@ -1890 +1893 @@
     REAL(r_std), DIMENSION (kjpindex,nvm)          :: zqsintvegnew
     LOGICAL, SAVE                                  :: firstcall=.TRUE.
-!    REAL(r_std), SAVE, DIMENSION(nvm)              :: throughfall_by_pft
 
     IF ( firstcall ) THEN
@@ -2078 +2080 @@
     DO jv = 1, nvm
       DO ji = 1, kjpindex
-         IF ( ABS(qsintveg(ji,jv)) > 0. .AND. ABS(qsintveg(ji,jv)) < EPS1 ) THEN
+         IF ( ABS(qsintveg(ji,jv)) > zero .AND. ABS(qsintveg(ji,jv)) < EPS1 ) THEN
             qsintveg(ji,jv) = EPS1
          ENDIF