Changeset 354 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/routing.f90

Timestamp:

2011-07-29T16:44:45+02:00 (13 years ago)

Author:

didier.solyga

Message:

Add labels for the new externalized parameters. Replace 1000 by mille in the code

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/routing.f90 (modified) (3 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/routing.f90

@@ -325 +325 @@
        ! Convert from kg/dtradia to m^3/dtradia
        !
-       hydrographs(:) = hydrographs(:)/1000.
+       hydrographs(:) = hydrographs(:)/mille
        !
     ENDIF
@@ -934 +934 @@
           IF ( route_tobasin(ig,ib) .GT. 0 ) THEN
              !
-             flow = MIN(fast_reservoir(ig,ib)/((topo_resid(ig,ib)/1000.)*fast_tcst*one_day/dt_routing),&
+             flow = MIN(fast_reservoir(ig,ib)/((topo_resid(ig,ib)/mille)*fast_tcst*one_day/dt_routing),&
                   & fast_reservoir(ig,ib))
              fast_flow(ig,ib) = flow
              !
-             flow = MIN(slow_reservoir(ig,ib)/((topo_resid(ig,ib)/1000.)*slow_tcst*one_day/dt_routing),&
+             flow = MIN(slow_reservoir(ig,ib)/((topo_resid(ig,ib)/mille)*slow_tcst*one_day/dt_routing),&
                   & slow_reservoir(ig,ib))
              slow_flow(ig,ib) = flow
              !
-             flow = MIN(stream_reservoir(ig,ib)/((topo_resid(ig,ib)/1000.)*stream_tcst*one_day/dt_routing),&
+             flow = MIN(stream_reservoir(ig,ib)/((topo_resid(ig,ib)/mille)*stream_tcst*one_day/dt_routing),&
                   & stream_reservoir(ig,ib))
              stream_flow(ig,ib) = flow
@@ -1892 +1892 @@
           WRITE(numout,*) '-------------> hierarchy ',hierarchy_bx(1,1)
           DO jp=1,nbj
-             WRITE(numout,fmt) INT(hierarchy_bx(1:nbi,jp)/1000.)
+             WRITE(numout,fmt) INT(hierarchy_bx(1:nbi,jp)/mille)
           ENDDO
           WRITE(numout,*) '-------------> topoindex ',topoind_bx(1,1)
           DO jp=1,nbj
-             WRITE(numout,fmt) INT(topoind_bx(1:nbi,jp)/1000.)
+             WRITE(numout,fmt) INT(topoind_bx(1:nbi,jp)/mille)
           ENDDO
           !