Changeset 103

Timestamp:

2011-02-11T15:17:23+01:00 (14 years ago)

Author:

didier.solyga

Message:

Change IMPOS_PARAM to IMPOSE_PARAM and the calling to pft_main

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90 (modified) (7 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -63 +63 @@
   LOGICAL, SAVE :: OFF_LINE_MODE = .FALSE. 
   !
-!!$ DS : ajout du flag IMPOS_PARAM
+!!$ DS : ajout du flag IMPOSE_PARAM
  ! Flag impos_param : it is set to true by default
-  LOGICAL, SAVE :: impos_param = .TRUE.
+  LOGICAL, SAVE :: impose_param = .TRUE.
   !
 CONTAINS
@@ -182 +182 @@
     CALL ipslnlf(new_number=numout,old_number=old_fileout)
 
-    ! Number of PFTs defined by the user
-      CALL getin('NVM',nvm)
+!!$    ! Number of PFTs defined by the user
+!!$      CALL getin('NVM',nvm)
     !
     IF (l_first_intersurf) THEN
@@ -2689 +2689 @@
     TYPE(control_type), INTENT(out)            :: control_flags !! Flags that (de)activate parts of the model
 
+
+    !
+    !Config Key  = NVM
+    !Config Desc = number of PFTs
+    CALL getin_p('NVM',nvm)
+    WRITE(numout,*)'the number of pfts is : ', nvm
+!!$DS Debug 28/01/2011
     !
     !Config Key  = LONGPRINT
@@ -2734 +2741 @@
        WRITE(numout,*) 'WATCHOUT file :', watchout_file
     ENDIF
+
+
+!!$    DS : reading of IMPOSE_PARAM
+    ! Option : do you want to change the values of the parameters
+    CALL getin_p('IMPOSE_PARAM',impose_param)
+    ! Calling pft_parameters
+    CALL pft_main  
     !
     !Config Key  = RIVER_ROUTING
@@ -2792 +2806 @@
 
 !!$    DS : reading of IMPOSE_PARAM
-    ! Option : do you want to change the values of the parameters
-    CALL getin_p('IMPOS_PARAM',impos_param)
-    ! Calling pft_parameters
-    CALL pft_main  
+!!$    ! Option : do you want to change the values of the parameters
+!!$    CALL getin_p('IMPOS_PARAM',impos_param)
+!!$    ! Calling pft_parameters
+!!$    CALL pft_main  
 
     !
@@ -2810 +2824 @@
     IF ( control_flags%ok_stomate ) THEN
        CALL getin_stomate_parameters
-       IF ( impos_param ) THEN      
+       IF ( impose_param ) THEN      
           CALL getin_stomate_pft_parameters
           WRITE(numout,*)'    some stomate_pft_parameters have been imposed '
@@ -2850 +2864 @@
     IF ( control_flags%ok_sechiba ) THEN
        CALL getin_sechiba_parameters
-       IF ( impos_param ) THEN      
+       IF ( impose_param ) THEN      
           CALL getin_sechiba_pft_parameters
           WRITE(numout,*)'    some sechiba_pft_parameters have been imposed '