Changeset 328

Timestamp:

2011-07-18T15:46:30+02:00 (13 years ago)

Author:

didier.solyga

Message:

Add first_call flag in veget_config subroutine. Add the default value of the flag disable_fire

File:

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

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/constantes.f90

@@ -413 +413 @@
   LOGICAL,SAVE    :: harvest_agri = .TRUE.
   ! constant moratlity
-  LOGICAL,SAVE    :: lpj_gap_const_mort=.TRUE.
+  LOGICAL,SAVE    :: lpj_gap_const_mort = .TRUE.
   ! flag that disable fire
-  LOGICAL, SAVE   :: disable_fire
+  LOGICAL, SAVE   :: disable_fire = .FALSE.
 
   !
@@ -1256 +1256 @@
       
      IMPLICIT NONE
+
+     ! first call
+     LOGICAL, SAVE ::  first_call = .TRUE.   
      
+     IF (first_call) THEN 
+
         !Config  Key  = AGRICULTURE
         !Config  Desc = agriculture allowed?
@@ -1332 +1337 @@
         CALL getin_p('VEGET_REINIT', veget_reinit)
 
-
-        ! Check consistency
-
-        ! 1. You have to activate agriculture and land_use
-        IF ( .NOT. agriculture .AND. land_use ) THEN 
-           CALL ipslerr (2,'veget_config', &
-               &     'Problem with agriculture desactivated and Land Use activated.',&
-               &     'Are you sure ?', &
-               &     '(check your parameters).')
-        ENDIF
+        first_call = .FALSE.
+
+     ENDIF
+
+     ! Check consistency
+
+     ! 1. You have to activate agriculture and land_use
+     IF ( .NOT. agriculture .AND. land_use ) THEN 
+        CALL ipslerr (2,'veget_config', &
+             &     'Problem with agriculture desactivated and Land Use activated.',&
+             &     'Are you sure ?', &
+             &     '(check your parameters).')
+     ENDIF
 
 !!$        ! DS : Add warning in case of a wrong configuration (need to be discussed)