Changeset 282

Timestamp:

2011-06-27T10:54:10+02:00 (13 years ago)

Author:

didier.solyga

Message:

Move some labels associated to externalized parameters in sechiba to pft_parameters.f90

Location:

branches/ORCHIDEE_EXT/ORCHIDEE

Files:

• src_parameters/pft_parameters.f90 (modified) (2 diffs)
• src_sechiba/diffuco.f90 (modified) (1 diff)
• src_sechiba/hydrol.f90 (modified) (1 diff)
• src_sechiba/hydrolc.f90 (modified) (1 diff)

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/pft_parameters.f90

@@ -1128 +1128 @@
      CALL getin_p('RSTRUCT_CONST',rstruct_const)
      CALL getin_p('KZERO',kzero)
+     !
+     ! Ajouts Nathalie - le 28 Mars 2006 - sur conseils Fred Hourdin
+     !
+     !Config Key  = RVEG_PFT
+     !Config Desc = Artificial parameter to increase or decrease canopy resistance.
+     !Config Def  = 1.
+     !Config Help = This parameter is set by PFT.
      CALL getin_p('RVEG_PFT', rveg_pft)    
      !-
@@ -1133 +1140 @@
      !-
      CALL getin_p('WMAX_VEG',wmax_veg)
+     !Config Key  = HYDROL_HUMCSTE
+     !Config Desc = Root profile
+     !Config Def  = 5., .8, .8, 1., .8, .8, 1., 1., .8, 4., 4., 4., 4.
+     !Config Help = Default values were defined for 2 meters soil depth.
+     !Config        For 4 meters soil depth, you may use those ones :
+     !Config        5., .4, .4, 1., .8, .8, 1., 1., .8, 4., 1., 4., 1.
      CALL getin_p('HYDROL_HUMCSTE', humcste)
+     !Config  Key  = PERCENT_THROUGHFALL_PFT
+     !Config  Desc = Percent by PFT of precip that is not intercepted by the canopy
+     !Config  Def  = 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30.
+     !Config  Help = During one rainfall event, PERCENT_THROUGHFALL_PFT% of the incident rainfall
+     !Config         will get directly to the ground without being intercepted, for each PFT.
      CALL getin_p('PERCENT_TROUGHFALL_PFT',throughfall_by_pft)
      !-

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/diffuco.f90

@@ -455 +455 @@
     ENDIF
 
-    !
-    ! Ajouts Nathalie - le 28 Mars 2006 - sur conseils Fred Hourdin
-    !
-    !Config Key  = RVEG_PFT
-    !Config Desc = Artificial parameter to increase or decrease canopy resistance.
-    !Config Def  = 1.
-    !Config Help = This parameter is set by PFT.
-
-!!$    CALL getin_p('RVEG_PFT', rveg_pft)
-
     WRITE(numout,*) 'DANS DIFFUCO_INIT , RVEG_PFT=',rveg_pft
 

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/hydrol.f90

@@ -1895 +1895 @@
 
     IF ( firstcall ) THEN
-!!$       !Config  Key  = PERCENT_THROUGHFALL_PFT
-!!$       !Config  Desc = Percent by PFT of precip that is not intercepted by the canopy
-!!$       !Config  Def  = 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30.
-!!$       !Config  Help = During one rainfall event, PERCENT_THROUGHFALL_PFT% of the incident rainfall
-!!$       !Config         will get directly to the ground without being intercepted, for each PFT.
-!!$       
-!!$!       throughfall_by_pft = (/ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30. /)
-!!$       CALL getin_p('PERCENT_THROUGHFALL_PFT',throughfall_by_pft)
+
        throughfall_by_pft = throughfall_by_pft / 100.
 

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/hydrolc.f90

@@ -1461 +1461 @@
 
     IF ( firstcall ) THEN
-!!$       !Config  Key  = PERCENT_THROUGHFALL_PFT
-!!$       !Config  Desc = Percent by PFT of precip that is not intercepted by the canopy
-!!$       !Config  Def  = 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30. 30.
-!!$       !Config  Help = During one rainfall event, PERCENT_THROUGHFALL_PFT% of the incident rainfall
-!!$       !Config         will get directly to the ground without being intercepted, for each PFT.
-!!$       
-!!$!       throughfall_by_pft = (/ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30. /)
-!!$       CALL getin_p('PERCENT_THROUGHFALL_PFT',throughfall_by_pft)
+
        throughfall_by_pft = throughfall_by_pft / 100.