Changeset 426

Timestamp:

2011-08-31T10:29:05+02:00 (13 years ago)

Author:

didier.solyga

Message:

Correct the conditions for reading the parameters in the run.def file

File:

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

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -2918 +2918 @@
     !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
@@ -2947 +2948 @@
     ! 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'
+    IF ( control_flags%ok_sechiba ) THEN
+       IF (impose_param ) THEN
+          CALL getin_sechiba_parameters
+          CALL getin_sechiba_pft_parameters
+          WRITE(numout,*)'    some sechiba parameters have been imposed '
+       ENDIF
     ENDIF
 
-    IF ( control_flags%ok_co2 .AND. impose_param ) THEN
-       CALL getin_co2_parameters
+    IF ( control_flags%ok_co2 ) THEN
+       IF ( impose_param ) THEN
+          CALL getin_co2_parameters
+          WRITE(numout,*)'    some co2 parameters have been imposed '         
+       ENDIF
     ENDIF
 
-    IF ( control_flags%hydrol_cwrr .AND. impose_param ) THEN
-       CALL getin_hydrol_cwrr_parameters
+    IF ( control_flags%hydrol_cwrr ) THEN
+       IF ( impose_param ) THEN      
+          CALL getin_hydrol_cwrr_parameters
+          WRITE(numout,*)'    some cwrr parameters have been imposed '        
+       ENDIF
     ELSE
        IF (impose_param) THEN
           CALL getin_hydrolc_parameters
-          ! we read the parameters for the choisnel hydrology
+          WRITE(numout,*)'    some Choisnel parameters have been imposed '
        ENDIF
     ENDIF
 
-    IF ( control_flags%river_routing .AND. impose_param ) THEN
-       CALL getin_routing_parameters
+    IF ( control_flags%river_routing ) THEN
+       IF (impose_param) THEN
+          CALL getin_routing_parameters
+          WRITE(numout,*)'    some routing parameters have been imposed '         
+       ENDIF
     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'
+    
+    IF ( control_flags%ok_stomate ) THEN
+       IF ( impose_param ) THEN
+          CALL getin_stomate_parameters
+          CALL getin_stomate_pft_parameters
+          WRITE(numout,*)'    some stomate parameters have been imposed '
+       ENDIF
     ENDIF
-
-     IF ( control_flags%ok_dgvm .AND. impose_param ) THEN
-       CALL getin_dgvm_parameters
+    
+    IF ( control_flags%ok_dgvm ) THEN
+       IF ( impose_param ) THEN
+          CALL getin_dgvm_parameters
+          WRITE(numout,*)'    some dgvm parameters have been imposed '         
+       ENDIF
     ENDIF