Changeset 326 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/slowproc.f90

Timestamp:

2011-07-18T11:42:45+02:00 (13 years ago)

Author:

didier.solyga

Message:

Synchronize intersurf.f90 and slowproc.f90 with the revisions 314 and 317 of the trunk

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/slowproc.f90 (modified) (2 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/slowproc.f90

@@ -703 +703 @@
        ! to be in sechiba when teststomate will have disapeared.
 !MM Problem here with dpu which depends on soil type
-    DO jv = 1, nbdl-1
+    DO l = 1, nbdl-1
        ! first 2.0 is dpu 
        ! second 2.0 is average
-       diaglev(jv) = dpu_cste/(2**(nbdl-1) -1) * ( ( 2**(jv-1) -1) + ( 2**(jv) -1) ) / 2.0
+       diaglev(l) = dpu_cste/(2**(nbdl-1) -1) * ( ( 2**(l-1) -1) + ( 2**(l) -1) ) / 2.0
     ENDDO
     diaglev(nbdl) = dpu_cste
@@ -2579 +2579 @@
              ! conservation :
              rapport = ( sum_veg - sumvAnthro ) / ( sum_veg - sumvAnthro_old )
-             veget_next(ib,1) = veget_last(ib,1) * rapport
-             DO jv = 2, nvm
-                IF ( .NOT. natural(jv) ) THEN
+             DO jv = 1, nvm
+                IF ( natural(jv) ) THEN
                    veget_next(ib,jv) = veget_last(ib,jv) * rapport
                 ENDIF
              ENDDO
              ! test
-             IF ( ABS( SUM(veget_next(ib,:)) - sum_veg ) > EPSILON(un) ) THEN
+             IF ( ABS( SUM(veget_next(ib,:)) - sum_veg ) > 10*EPSILON(un) ) THEN
                 WRITE(numout,*) "No conservation of sum of veget for point ",ib,",(",lalo(ib,1),",",lalo(ib,2),")" 
                 WRITE(numout,*) "last sum of veget ",sum_veg," new sum of veget ",SUM(veget_next(ib,:))," error : ",&
                      &                         SUM(veget_next(ib,:)) - sum_veg
-                WRITE(numout,*) "Anthropic modificaztions : last ",sumvAnthro_old," new ",sumvAnthro                
+                WRITE(numout,*) "Anthropic modifications : last ",sumvAnthro_old," new ",sumvAnthro  
                 CALL ipslerr (3,'slowproc_update', &
                      &          'No conservation of sum of veget_next', &