Changeset 407 for branches

Timestamp:

2011-08-29T10:06:18+02:00 (13 years ago)

Author:

didier.solyga

Message:

Merge the last revisions of the trunk (388 to 392). The externalized version is now based on the tag 1_9_5_2

Location:

branches/ORCHIDEE_EXT/ORCHIDEE

Files:

• src_sechiba/intersurf.f90 (modified) (2 diffs)
• src_sechiba/routing.f90 (modified) (1 diff)
• src_stomate/stomate_io.f90 (modified) (1 diff)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -2778 +2778 @@
     CALL getin_p('LONGPRINT',long_print)
     !
+    !Config Key  = CHECKTIME
+    !Config Desc = ORCHIDEE will print messages on time
+    !Config Def  = n
+    !Config Help = This flag permits to print debug messages on the time.
+    !
+    check_time = .FALSE.
+    CALL getin_p('CHECKTIME',check_time)
+    !
     !
     !Config Key  = ORCHIDEE_WATCHOUT
@@ -2960 +2968 @@
     ! DS: activation of 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, lcchnage...previously in slowproc)
+    ! Vegetation configuration(impose_veg, land_use, lcchange...previously in slowproc)
     CALL veget_config
     !

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/routing.f90

@@ -538 +538 @@
        CALL ioconf_setatt('LONG_NAME','Time counter for the routing scheme')
        CALL restget (rest_id, var_name, 1, 1, 1, kjit, .TRUE., tmp_day)
-       time_counter = tmp_day(1) 
+       IF (tmp_day(1) == val_exp) THEN
+          time_counter = zero
+       ELSE
+          time_counter = tmp_day(1) 
+       ENDIF
        CALL setvar (time_counter, val_exp, 'NO_KEYWORD', zero)
     ENDIF

branches/ORCHIDEE_EXT/ORCHIDEE/src_stomate/stomate_io.f90

@@ -343 +343 @@
        date = NINT(date_real)
     ENDIF
-    CALL bcast(date_real)
+    CALL bcast(date)
     !-
     ! 3 daily meteorological variables