Changeset 103


Ignore:
Timestamp:
02/11/11 15:17:23 (11 years ago)
Author:
didier.solyga
Message:

Change IMPOS_PARAM to IMPOSE_PARAM and the calling to pft_main

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

    r64 r103  
    6363  LOGICAL, SAVE :: OFF_LINE_MODE = .FALSE.  
    6464  ! 
    65 !!$ DS : ajout du flag IMPOS_PARAM 
     65!!$ DS : ajout du flag IMPOSE_PARAM 
    6666 ! Flag impos_param : it is set to true by default 
    67   LOGICAL, SAVE :: impos_param = .TRUE. 
     67  LOGICAL, SAVE :: impose_param = .TRUE. 
    6868  ! 
    6969CONTAINS 
     
    182182    CALL ipslnlf(new_number=numout,old_number=old_fileout) 
    183183 
    184     ! Number of PFTs defined by the user 
    185       CALL getin('NVM',nvm) 
     184!!$    ! Number of PFTs defined by the user 
     185!!$      CALL getin('NVM',nvm) 
    186186    ! 
    187187    IF (l_first_intersurf) THEN 
     
    26892689    TYPE(control_type), INTENT(out)            :: control_flags !! Flags that (de)activate parts of the model 
    26902690 
     2691 
     2692    ! 
     2693    !Config Key  = NVM 
     2694    !Config Desc = number of PFTs 
     2695    CALL getin_p('NVM',nvm) 
     2696    WRITE(numout,*)'the number of pfts is : ', nvm 
     2697!!$DS Debug 28/01/2011 
    26912698    ! 
    26922699    !Config Key  = LONGPRINT 
     
    27342741       WRITE(numout,*) 'WATCHOUT file :', watchout_file 
    27352742    ENDIF 
     2743 
     2744 
     2745!!$    DS : reading of IMPOSE_PARAM 
     2746    ! Option : do you want to change the values of the parameters 
     2747    CALL getin_p('IMPOSE_PARAM',impose_param) 
     2748    ! Calling pft_parameters 
     2749    CALL pft_main   
    27362750    ! 
    27372751    !Config Key  = RIVER_ROUTING 
     
    27922806 
    27932807!!$    DS : reading of IMPOSE_PARAM 
    2794     ! Option : do you want to change the values of the parameters 
    2795     CALL getin_p('IMPOS_PARAM',impos_param) 
    2796     ! Calling pft_parameters 
    2797     CALL pft_main   
     2808!!$    ! Option : do you want to change the values of the parameters 
     2809!!$    CALL getin_p('IMPOS_PARAM',impos_param) 
     2810!!$    ! Calling pft_parameters 
     2811!!$    CALL pft_main   
    27982812 
    27992813    ! 
     
    28102824    IF ( control_flags%ok_stomate ) THEN 
    28112825       CALL getin_stomate_parameters 
    2812        IF ( impos_param ) THEN       
     2826       IF ( impose_param ) THEN       
    28132827          CALL getin_stomate_pft_parameters 
    28142828          WRITE(numout,*)'    some stomate_pft_parameters have been imposed ' 
     
    28502864    IF ( control_flags%ok_sechiba ) THEN 
    28512865       CALL getin_sechiba_parameters 
    2852        IF ( impos_param ) THEN       
     2866       IF ( impose_param ) THEN       
    28532867          CALL getin_sechiba_pft_parameters 
    28542868          WRITE(numout,*)'    some sechiba_pft_parameters have been imposed ' 
Note: See TracChangeset for help on using the changeset viewer.