Changeset 354 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba

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

Location:

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba

Files:

• intersurf.f90 (modified) (10 diffs)
• routing.f90 (modified) (3 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -501 +501 @@
 
        z0(i,j)           = zz0(ik)
-       coastalflow(i,j)  = zcoastal(ik)/1000.
-       riverflow(i,j)    = zriver(ik)/1000.
+       coastalflow(i,j)  = zcoastal(ik)/mille
+       riverflow(i,j)    = zriver(ik)/mille
        tsol_rad(i,j)     = ztsol_rad(ik)
        vevapp(i,j)       = zvevapp(ik)
@@ -520 +520 @@
     ! Modified fields for variables scattered during the writing
     !
-    dcoastal(:) = (zcoastal(:))/1000.     
-    driver(:)   = (zriver(:))/1000.
+    dcoastal(:) = (zcoastal(:))/mille     
+    driver(:)   = (zriver(:))/mille
     !
     IF ( .NOT. l_first_intersurf) THEN
@@ -1009 +1009 @@
        
        z0(kindex(ik))           = zz0(ik)
-       coastalflow(kindex(ik))  = zcoastal(ik)/1000.
-       riverflow(kindex(ik))    = zriver(ik)/1000.
+       coastalflow(kindex(ik))  = zcoastal(ik)/mille
+       riverflow(kindex(ik))    = zriver(ik)/mille
        tsol_rad(kindex(ik))     = ztsol_rad(ik)
        vevapp(kindex(ik))       = zvevapp(ik)
@@ -1028 +1028 @@
     ! Modified fields for variables scattered during the writing
     !
-    dcoastal(:) = (zcoastal(:))/1000.
-    driver(:)   = (zriver(:))/1000.
+    dcoastal(:) = (zcoastal(:))/mille
+    driver(:)   = (zriver(:))/mille
     !
     IF ( .NOT. l_first_intersurf) THEN
@@ -1717 +1717 @@
        
        z0(ik)           = zz0(ik)
-       coastalflow(ik)  = zcoastal(ik)/1000.
-       riverflow(ik)    = zriver(ik)/1000.
+       coastalflow(ik)  = zcoastal(ik)/mille
+       riverflow(ik)    = zriver(ik)/mille
        tsol_rad(ik)     = ztsol_rad(ik)
        vevapp(ik)       = zvevapp(ik)
@@ -1747 +1747 @@
     ! Modified fields for variables scattered during the writing
     !
-    dcoastal(:) = (zcoastal(:))/1000.
-    driver(:)   = (zriver(:))/1000.
+    dcoastal(:) = (zcoastal(:))/mille
+    driver(:)   = (zriver(:))/mille
     !
     IF ( .NOT. l_first_intersurf) THEN
@@ -2495 +2495 @@
        
        z0(ik)           = zz0(ik)
-       coastalflow(ik)  = zcoastal(ik)/1000.
-       riverflow(ik)    = zriver(ik)/1000.
+       coastalflow(ik)  = zcoastal(ik)/mille
+       riverflow(ik)    = zriver(ik)/mille
        tsol_rad(ik)     = ztsol_rad(ik)
        vevapp(ik)       = zvevapp(ik)
@@ -2527 +2527 @@
     ! Modified fields for variables scattered during the writing
     !
-    dcoastal(:) = (zcoastal(:))/1000.
-    driver(:)   = (zriver(:))/1000.
+    dcoastal(:) = (zcoastal(:))/mille
+    driver(:)   = (zriver(:))/mille
     !
     IF ( .NOT. l_first_intersurf) THEN
@@ -2762 +2762 @@
     !
     !Config Key  = NVM
-    !Config Desc = number of PFTs
+    !Config Desc = number of PFTs  
+    !Config  if  = ANYTIME
+    !Config  Def  = 13
+    !Config  Help = The number of vegetation types define by the user
+    !Config  Units = NONE
     CALL getin_p('NVM',nvm)
     WRITE(numout,*)'the number of pfts is : ', nvm
@@ -2811 +2815 @@
     ENDIF
 
-!!$    DS : reading of IMPOSE_PARAM
-    ! Option : do you want to change the values of the parameters
+    !Config Key  = IMPOSE_PARAM
+    !Config Desc = Do you impose the values of the parameters?
+    !Config  if  = ANYTIME
+    !Config  Def  = y
+    !Config  Help = This flag can deactivate the reading of some paramters.
+    !               Useful if you want to use the standard values without commenting the run.def
+    !Config  Units = NONE
     CALL getin_p('IMPOSE_PARAM',impose_param)
+
+    ! Read and allocate the pft parameters
     CALL pft_parameters_main  
+
     !
     !Config Key  = RIVER_ROUTING

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
           !