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

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/thermosoil.f90

@@ -3 +3 @@
 !!
 !! @author Marie-Alice Foujols and Jan Polcher
-!! @Version : $Revision: 1.15 $, $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/thermosoil.f90,v 1.15 2009/01/07 13:39:45 ssipsl Exp $
+!< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE/src_sechiba/thermosoil.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
@@ -98 +101 @@
     REAL(r_std),DIMENSION (kjpindex), INTENT (in)      :: temp_sol_new     !! New soil temperature
     REAL(r_std),DIMENSION (kjpindex), INTENT (in)      :: snow             !! Snow quantity
+    REAL(r_std),DIMENSION (kjpindex,nbdl), INTENT (in) :: shumdiag         !! Diagnostic of relative humidity
     ! output fields
-    REAL(r_std),DIMENSION (kjpindex), INTENT (out)     :: soilcap          !! Soil capacity
-    REAL(r_std),DIMENSION (kjpindex), INTENT (out)     :: soilflx          
-    REAL(r_std),DIMENSION (kjpindex,nbdl), INTENT (in) :: shumdiag         !! Diagnostic of relative humidity
-    REAL(r_std),DIMENSION (kjpindex,nbdl), INTENT (out):: stempdiag        !! diagnostic temp profile
+    REAL(r_std),DIMENSION (kjpindex), INTENT (inout)     :: soilcap        !! Soil capacity
+    REAL(r_std),DIMENSION (kjpindex), INTENT (inout)     :: soilflx          
+    REAL(r_std),DIMENSION (kjpindex,nbdl), INTENT (inout):: stempdiag        !! diagnostic temp profile
 
     REAL(r_std),DIMENSION (kjpindex,ngrnd) :: temp
@@ -645 +648 @@
     REAL(r_std), DIMENSION (kjpindex), INTENT (out)          :: soilflx           !!
     REAL(r_std), DIMENSION (kjpindex), INTENT (out)          :: z1                !!
-    REAL(r_std), DIMENSION (kjpindex,ngrnd), INTENT(out)     :: pcapa             !!
-    REAL(r_std), DIMENSION (kjpindex,ngrnd), INTENT(out)     :: pcapa_en          !!
-    REAL(r_std), DIMENSION (kjpindex,ngrnd), INTENT(out)     :: pkappa            !!
+    REAL(r_std), DIMENSION (kjpindex,ngrnd), INTENT(inout)     :: pcapa             !!
+    REAL(r_std), DIMENSION (kjpindex,ngrnd), INTENT(inout)     :: pcapa_en          !!
+    REAL(r_std), DIMENSION (kjpindex,ngrnd), INTENT(inout)     :: pkappa            !!
     REAL(r_std), DIMENSION (kjpindex,ngrnd-1), INTENT(out)     :: cgrnd             !!
     REAL(r_std), DIMENSION (kjpindex,ngrnd-1), INTENT(out)     :: dgrnd             !!
@@ -837 +840 @@
                 lev_prog = prev_prog + dz2(jg)
              ENDIF
-            intfact(jd,jg) = MAX(MIN(lev_diag,lev_prog)-MAX(prev_diag, prev_prog), 0.0)/(lev_diag-prev_diag)
+            intfact(jd,jg) = MAX(MIN(lev_diag,lev_prog)-MAX(prev_diag, prev_prog), zero)/(lev_diag-prev_diag)
             prev_prog = lev_prog
           ENDDO
@@ -857 +860 @@
     ENDIF
 
-    stempdiag(:,:) = 0.
+    stempdiag(:,:) = zero
     DO jg = 1, ngrnd
       DO jd = 1, nbdl
@@ -907 +910 @@
                 lev_prog = diaglev(jg)
              ENDIF
-             intfactw(jd,jg) = MAX(MIN(lev_diag,lev_prog)-MAX(prev_diag, prev_prog), 0.0)/(lev_diag-prev_diag)
+             intfactw(jd,jg) = MAX(MIN(lev_diag,lev_prog)-MAX(prev_diag, prev_prog), zero)/(lev_diag-prev_diag)
              prev_prog = lev_prog
           ENDDO
@@ -927 +930 @@
     ENDIF
 
-    wetdiag(:,:) = 0.
+    wetdiag(:,:) = zero
     DO jg = 1, nbdl
       DO jd = 1, ngrnd