Changeset 471 for branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/constantes.f90

Timestamp:

2011-09-13T09:25:22+02:00 (13 years ago)

Author:

didier.solyga

Message:

Correct wrong loops in slowproc (wrong algorithm and wrong vectorisation). Replace the differents ok_sechiba, ok_stomate, etc by a structure control_type for simplifying the routines

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/constantes.f90 (modified) (2 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/constantes.f90

@@ -1137 +1137 @@
  CONTAINS
 
-   SUBROUTINE activate_sub_models(ok_sechiba,ok_routing, ok_stomate)
+   SUBROUTINE activate_sub_models(active_flags)
 
      IMPLICIT NONE
+
+     ! 0.1 input
+
+     ! What parts of the code are activated ?
+     TYPE(control_type),INTENT(in) :: active_flags
+
      ! first call
      LOGICAL, SAVE ::  first_call = .TRUE.   
-     ! input
-     LOGICAL, INTENT(in) :: ok_sechiba
-     LOGICAL, INTENT(in) :: ok_routing
-     LOGICAL, INTENT(in) :: ok_stomate    
 
      IF (first_call) THEN 
 
-        IF(ok_sechiba .AND. ok_routing) THEN
+        IF(active_flags%ok_sechiba .AND. active_flags%river_routing) THEN
            
            !Config Key  = DO_IRRIGATION
@@ -1174 +1176 @@
 
            
-        IF(ok_stomate) THEN
+        IF(active_flags%ok_stomate) THEN
 
            !Config  Key  = HERBIVORES