Changeset 313

Timestamp:

2011-07-08T14:37:04+02:00 (13 years ago)

Author:

didier.solyga

Message:

Update teststomate.f90 and forcesoil.f90 in order to take into account the modifications of the revisions 311 and 312

Location:

branches/ORCHIDEE_EXT/ORCHIDEE_OL

Files:

• forcesoil.f90 (modified) (2 diffs)
• teststomate.f90 (modified) (1 diff)

branches/ORCHIDEE_EXT/ORCHIDEE_OL/forcesoil.f90

@@ -94 +94 @@
 
   ! 3. Initialisation of the correspondance table
-  pft_to_mtc (:) = undef_integer
+  pft_to_mtc (:) = undef_int
   
   ! 4.Reading of the conrrespondance table in the .def file
@@ -101 +101 @@
   ! 4.1 if nothing is found, we use the standard configuration
   IF(nvm .EQ. 13 ) THEN
-     IF(pft_to_mtc(1) .EQ. undef_integer) THEN
+     IF(pft_to_mtc(1) .EQ. undef_int) THEN
         WRITE(numout,*) 'Note to the user : we will use ORCHIDEE to its standard configuration'
         pft_to_mtc(:) = (/ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 /)
      ENDIF
   ELSE   
-     IF(pft_to_mtc(1) .EQ. undef_integer) THEN
+     IF(pft_to_mtc(1) .EQ. undef_int) THEN
         WRITE(numout,*)' The array PFT_TO_MTC is empty : we stop'
      ENDIF

branches/ORCHIDEE_EXT/ORCHIDEE_OL/teststomate.f90

@@ -365 +365 @@
   control%ok_stomate = .TRUE.
 !!$ >> DS now we search the values for the scalar parameters in  some .def files
+  ! 07/2011
+  CALL activate_sub_models(control%ok_sechiba,control%river_routing,control%ok_stomate)
+  CALL veget_config
+  !
   CALL getin_co2_parameters
   CALL getin_stomate_parameters