Changeset 425 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba

Timestamp:

2011-08-31T09:32:29+02:00 (13 years ago)

Author:

didier.solyga

Message:

Optimize allocation memory for pft parameters. Reorganize the algorithm for the externalization : the parameters can be read only if IMPOSE_PARAM is set to true. Rewrite a loop in slowproc.f90.

Location:

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba

Files:

• intersurf.f90 (modified) (9 diffs)
• slowproc.f90 (modified) (1 diff)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -69 +69 @@
   !
 !!$ DS : ajout du flag IMPOSE_PARAM
- ! Flag impos_param : it is set to true by default
+  ! Flag impos_param : it is set to true by default
   LOGICAL, SAVE :: impose_param = .TRUE.
   !
@@ -2759 +2759 @@
     TYPE(control_type), INTENT(out)            :: control_flags !! Flags that (de)activate parts of the model
 
-
-    !
-    !Config Key  = NVM
-    !Config Desc = number of PFTs  
-    !Config  if  = ANYTIME
-    !Config  Def  = 13
-    !Config  Help = The number of vegetation types define by the user
-    !Config  Units = NONE
-    CALL getin_p('NVM',nvm)
-    WRITE(numout,*)'the number of pfts is : ', nvm
     !
     !Config Key  = LONGPRINT
@@ -2823 +2813 @@
     ENDIF
 
-    !Config Key  = IMPOSE_PARAM
-    !Config Desc = Do you impose the values of the parameters?
-    !Config  if  = ANYTIME
-    !Config  Def  = y
-    !Config  Help = This flag can deactivate the reading of some paramters.
-    !               Useful if you want to use the standard values without commenting the run.def
-    !Config  Units = NONE
-    CALL getin_p('IMPOSE_PARAM',impose_param)
-
-    ! Read and allocate the pft parameters
-    CALL pft_parameters_main  
-
     !
     !Config Key  = RIVER_ROUTING
@@ -2847 +2825 @@
     WRITE(numout,*) "RIVER routing is activated : ",control_flags%river_routing
     !
-!!$    DS : reading of parameters associated to river_routing
-    IF ( control_flags%river_routing ) THEN
-       CALL getin_routing_parameters
-    ENDIF
 
     !
@@ -2870 +2844 @@
     ENDIF
     !
-!!$    DS : reading of parameters associated to hydrol_cwrr
-    IF ( control_flags%hydrol_cwrr ) THEN
-       CALL getin_hydrol_cwrr_parameters
-    ELSE
-       CALL getin_hydrolc_parameters
-       ! we read the parameters for the choisnel hydrology
-    ENDIF
 
     !
@@ -2888 +2855 @@
     WRITE(numout,*) 'photosynthesis: ', control_flags%ok_co2
     !
-!!$    DS : reading of parameters associated to ok_co2
-    IF ( control_flags%ok_co2 ) THEN
-       CALL getin_co2_parameters
-    ENDIF
 
     !
@@ -2903 +2866 @@
     WRITE(numout,*) 'STOMATE is activated: ',control_flags%ok_stomate
     !
-!!$    DS : reading of parameters associated to ok_stomate
-    IF ( control_flags%ok_stomate ) THEN
-       CALL getin_stomate_parameters
-       IF ( impose_param ) THEN      
-          CALL getin_stomate_pft_parameters
-          WRITE(numout,*)'    some stomate_pft_parameters have been imposed '
-       ELSE 
-          WRITE(numout,*)'    all stomate_pft_parameters are set to default values'
-       ENDIF
-    ENDIF
 
     !
@@ -2927 +2880 @@
     !
     control_flags%ok_sechiba = .TRUE.
-!!$    DS : reading of parameters associated to ok_sechiba
-    IF ( control_flags%ok_sechiba ) THEN
-       CALL getin_sechiba_parameters
-       IF ( impose_param ) THEN      
-          CALL getin_sechiba_pft_parameters
-          WRITE(numout,*)'    some sechiba_pft_parameters have been imposed '
-       ELSE 
-          WRITE(numout,*)'    all sechiba_pft_parameters are set to default values'
-       ENDIF
-    ENDIF
-
     !
     !
@@ -2965 +2907 @@
     control_flags%ok_pheno = .TRUE.
     !
-!>> july 2011
-    ! DS: activation of sub-models of ORCHIDEE
+
+!>> DS 08/2011 : for externalisation
+
+    ! 1. Number of PFTs defined by the user
+
+    !Config Key  = NVM
+    !Config Desc = number of PFTs  
+    !Config if  = ANYTIME
+    !Config Def  = 13
+    !Config Help = The number of vegetation types define by the user
+    !Config Units = NONE
+    CALL getin_p('NVM',nvm)
+    WRITE(numout,*)'the number of pfts is : ', nvm
+
+    ! 2. Should we read the parameters in the run.def file ?
+
+    !Config Key  = IMPOSE_PARAM
+    !Config Desc = Do you impose the values of the parameters?
+    !Config if  = ANYTIME
+    !Config Def  = y
+    !Config Help = This flag can deactivate the reading of some parameters.
+    !               Useful if you want to use the standard values without commenting the run.def
+    !Config Units = NONE
+    !
+    CALL getin_p('IMPOSE_PARAM',impose_param)
+
+    ! 3. Allocate and intialize the pft parameters
+
+    CALL pft_parameters_main(control_flags%ok_sechiba,control_flags%ok_stomate)
+
+    ! 4. Activation sub-models of ORCHIDEE
+
     CALL activate_sub_models(control_flags%ok_sechiba, control_flags%river_routing,control_flags%ok_stomate)
-    ! Vegetation configuration(impose_veg, land_use, lcchange...previously in slowproc)
+
+    ! 5. Vegetation configuration (impose_veg, land_use, lcchange...previously in slowproc)
+
     CALL veget_config
+
+    ! 6. Read the parameters in the run.def file  according the flags
+
+    IF ( control_flags%ok_sechiba .AND. impose_param ) THEN
+       CALL getin_sechiba_parameters
+       CALL getin_sechiba_pft_parameters
+       WRITE(numout,*)'    some sechiba_pft_parameters have been imposed '
+    ELSE 
+       WRITE(numout,*)'    all sechiba_pft_parameters are set to default values'
+    ENDIF
+
+    IF ( control_flags%ok_co2 .AND. impose_param ) THEN
+       CALL getin_co2_parameters
+    ENDIF
+
+    IF ( control_flags%hydrol_cwrr .AND. impose_param ) THEN
+       CALL getin_hydrol_cwrr_parameters
+    ELSE
+       IF (impose_param) THEN
+          CALL getin_hydrolc_parameters
+          ! we read the parameters for the choisnel hydrology
+       ENDIF
+    ENDIF
+
+    IF ( control_flags%river_routing .AND. impose_param ) THEN
+       CALL getin_routing_parameters
+    ENDIF
+
+    IF ( control_flags%ok_stomate .AND. impose_param ) THEN
+       CALL getin_stomate_parameters
+       CALL getin_stomate_pft_parameters
+       WRITE(numout,*)'    some stomate_pft_parameters have been imposed '
+    ELSE 
+       WRITE(numout,*)'    all stomate_pft_parameters are set to default values'
+    ENDIF
+
+     IF ( control_flags%ok_dgvm .AND. impose_param ) THEN
+       CALL getin_dgvm_parameters
+    ENDIF    
+
+!>> END DS
+    !
     !
     RETURN

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/slowproc.f90

@@ -946 +946 @@
              IF (.NOT. agriculture) THEN
                 DO jv = 2, nvm  
-                   DO ji = 1, kjpindex
-                      IF ( .NOT. natural (jv))  THEN
+                   IF ( .NOT. natural (jv))  THEN
+                      DO ji = 1, kjpindex
                          veget_max(ji,1) = veget_max(ji,1) + veget_max(ji,jv)
                          veget_max(ji,jv) = zero
-                      ENDIF
-                   ENDDO
+                      ENDDO
+                   ENDIF
                 ENDDO
              ENDIF