Changeset 289 for branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters

Timestamp:

2011-07-04T08:19:42+02:00 (14 years ago)

Author:

didier.solyga

Message:

Externalized PFT_name. The user can give names to the PFTs he/she will use. The data could be read in the standard output of ORCHIDEE (out_orchidee_ol files)

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/pft_parameters.f90 (modified) (4 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/pft_parameters.f90

@@ -412 +412 @@
       ! 3.2 Reading of the conrrespondance table in the .def file
       CALL getin_p('PFT_TO_MTC',pft_to_mtc)
-
+      
       ! 3.3 If the user want to use the standard configuration, he needn't to fill the correspondance array
       !     If the configuration is wrong, send a error message to the user.
@@ -454 +454 @@
       CALL pft_parameters_init
 
-      ! 5. A useful message to the user: correspondance between the number of the pft
+      ! 5. Useful data
+
+      ! 5.1 Read the name of the PFTs given by the user
+      CALL getin('PFT_NAME',pft_name)
+
+      ! 5.2 A useful message to the user: correspondance between the number of the pft
       ! and the name of the associated mtc 
       DO i = 1,nvm
-         WRITE(numout,*) 'the PFT',i,'corresponds to the MTC : ',PFT_name(i) 
+         WRITE(numout,*) 'the PFT',i, 'called  ', PFT_name(i),'corresponds to the MTC : ',MTC_name(pft_to_mtc(i)) 
       ENDDO
 
@@ -796 +801 @@
       lowgpp_time(j) = lowgpp_time_mtc(pft_to_mtc(j))
       hum_min_time(j) = hum_min_time_mtc(pft_to_mtc(j))
-      tau_sap(j) =tau_sap_mtc(pft_to_mtc(j))
-      tau_fruit(j) =tau_fruit_mtc(pft_to_mtc(j))
+      tau_sap(j) = tau_sap_mtc(pft_to_mtc(j))
+      tau_fruit(j) = tau_fruit_mtc(pft_to_mtc(j))
       ecureuil(j) = ecureuil_mtc(pft_to_mtc(j))
       alloc_min(j) = alloc_min_mtc(pft_to_mtc(j))
@@ -822 +827 @@
       residence_time(j) = residence_time_mtc(pft_to_mtc(j))
       tmin_crit(j) = tmin_crit_mtc(pft_to_mtc(j))
-      tcm_crit(j) =  tcm_crit_mtc(pft_to_mtc(j))
+      tcm_crit(j) = tcm_crit_mtc(pft_to_mtc(j))
       
    ENDDO ! end loop over nvm