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

Timestamp:

2011-06-20T15:28:40+02:00 (13 years ago)

Author:

didier.solyga

Message:

Correct forcesoil.f90 and teststomate.f90 for working with the externalized version (branche ORCHIDEE_EXT)

File:

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

branches/ORCHIDEE_EXT/ORCHIDEE_OL/teststomate.f90

@@ -53 +53 @@
   REAL(r_std),DIMENSION(:,:),ALLOCATABLE    :: qsintmax_x
   REAL(r_std),DIMENSION(:,:),ALLOCATABLE    :: co2_flux
-!!$   DS add for externalised version
+!!$ >>  DS add for externalised version
   REAL(r_std),DIMENSION(:),ALLOCATABLE      :: hist_PFTaxis
-!!$   DS
+!!$ >>  DS
 
 
@@ -75 +75 @@
   CHARACTER(LEN=30)                :: time_str
   REAL                             :: hist_days_stom,hist_dt_stom
-!!$  REAL,DIMENSION(nvm)              :: hist_PFTaxis
   REAL(r_std),DIMENSION(10)         :: hist_pool_10axis     
   REAL(r_std),DIMENSION(100)        :: hist_pool_100axis     
@@ -176 +175 @@
   write(*,*) 'ATTENTION',dtradia,dt_force
 
-!!$ DS added for the externalised version
-!!$we need to know the pft parameters values used for stomate
+!!$ >> DS added for the externalised version
+!!$ we need to know the pft parameters values used for stomate
+
+  ! 1. Read the number of PFTs
+  CALL getin('NVM',nvm)
+  ! 2. Allocate and read the pft parameters stomate specific
   CALL pft_parameters_main
   CALL getin_stomate_pft_parameters
@@ -186 +189 @@
 !-
   a_er = .FALSE.
-!!$ DS added for the externalised version
-!!$  ALLOCATE (pft_to_mtc(nvm),stat=ier)
-!!$  a_er = a_er .OR. (ier.NE.0) 
+!!$ >> DS added for the externalised version
   ALLOCATE (hist_PFTaxis(nvm),stat=ier)
   a_er = a_er .OR. (ier.NE.0)
@@ -356 +357 @@
   control%ok_co2 = .TRUE.
   control%ok_stomate = .TRUE.
-!!$DS now we search the values for the scalar parameters in orchidee.def
+!!$ >> DS now we search the values for the scalar parameters in  some .def files
   CALL getin_co2_parameters
   CALL getin_stomate_parameters
-!!$  CALL getin('CLAYFRACTION_DEFAULT',clayfraction_default)
+!!$ >> DS 
 !-
 ! is DGVM activated?
@@ -366 +367 @@
   CALL getin('STOMATE_OK_DGVM',control%ok_dgvm)
   WRITE(*,*) 'LPJ is activated: ',control%ok_dgvm
-!!$DS for the externalisation reading the scalar parameters when ok_dgvm is set to true
+!!$ >> DS for the externalisation reading the scalar parameters when ok_dgvm is set to true
   IF (control%ok_dgvm) THEN 
      CALL getin_dgvm_parameters   
   ENDIF
+!!$ >> DS 
 !-
 ! restart files
@@ -542 +544 @@
 !-
   
-  ! DS : getin the value of slowproc parameters
+  ! >> DS : getin the value of slowproc parameters
   CALL getin('CLAYFRACTION_DEFAULT',clayfraction_default)
+  CALL getin('SOILTYPE_DEFAULT',soiltype_default)
+  ! >> DS
 
   CALL slowproc_main &