Changeset 427 for branches/ORCHIDEE_EXT/ORCHIDEE_OL/teststomate.f90

Timestamp:

2011-08-31T10:30:44+02:00 (13 years ago)

Author:

didier.solyga

Message:

Reorganize the algorithm for using teststomate with the externalization

File:

• branches/ORCHIDEE_EXT/ORCHIDEE_OL/teststomate.f90 (modified) (3 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE_OL/teststomate.f90

@@ -83 +83 @@
 !!$ >>  DS for the externalized version
   REAL(r_std),ALLOCATABLE,DIMENSION(:) :: hist_PFTaxis
+  ! Flag impos_param : it is set to true by default
+  LOGICAL, SAVE :: impose_param = .TRUE.
 !!$ >>  DS
   REAL(r_std),DIMENSION(10)         :: hist_pool_10axis     
@@ -215 +217 @@
   CALL getin_p('LONGPRINT',long_print)
 
-!!$ >> DS added for the externalised version
-!!$ we need to know the pft parameters values used for stomate
-
-  ! 1. Read the number of PFTs
-  !
-  !Config Key  = NVM
-  !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)
-
-  ! 2. Allocate and read the pft parameters stomate specific
-  CALL pft_parameters_main
-!!$ DS
-
   !-
   ! activate CO2, STOMATE, but not sechiba
@@ -249 +234 @@
   WRITE(numout,*) 'LPJ is activated: ',control%ok_dgvm
 
-!!$ >> DS now we search the values for the scalar parameters in  some .def files
-
-  ! 07/2011
+!!$ >> DS added for the externalised version
+
+  ! 1. Number of PFTs defined by the user
+
+  !Config Key  = NVM
+  !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
+
+  ! 2. Should we read the parameters in the run.def file ?
+  
+  !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 parameters.
+  !               Useful if you want to use the standard values without commenting the run.def
+  !Config Units = NONE
+  !
+  CALL getin_p('IMPOSE_PARAM',impose_param)
+
+  ! 3. Allocate and intialize the pft parameters
+
+  CALL pft_parameters_main(control%ok_sechiba,control%ok_stomate)
+
+  ! 4. Activation sub-models of ORCHIDEE
+
   CALL activate_sub_models(control%ok_sechiba,control%river_routing,control%ok_stomate)
+
+  ! 5. Vegetation configuration (impose_veg, land_use, lcchange...previously in slowproc)
+
   CALL veget_config
-  !
-  CALL getin_stomate_pft_parameters
-  CALL getin_co2_parameters
-   CALL getin_stomate_parameters
-  IF (control%ok_dgvm) THEN 
-     CALL getin_dgvm_parameters   
-  ENDIF
+
+  ! 6. Read the parameters in the run.def file
+
+  IF ( impose_param) THEN
+     CALL getin_stomate_pft_parameters
+     CALL getin_co2_parameters
+     CALL getin_stomate_parameters
+  ENDIF
+  !-
+  IF (control%ok_dgvm) THEN
+     IF ( impose_param ) THEN
+        CALL getin_dgvm_parameters
+     ENDIF
+  ENDIF
+
 !!$ >> DS