Changeset 366 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba

Timestamp:

2011-08-01T11:23:28+02:00 (13 years ago)

Author:

didier.solyga

Message:

Externalized stemdiag_bid. Synchronize intersurf.f90 and stomate.f90 with revisions 351 and 352 of the trunk

File:

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

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -36 +36 @@
 
   PRIVATE
-  PUBLIC :: intersurf_main, stom_define_history, intsurf_time
+  PUBLIC :: intersurf_main, stom_define_history, stom_IPCC_define_history, intsurf_time
 
   INTERFACE intersurf_main
@@ -63 +63 @@
   REAL(r_std) :: julian0
   !
-  LOGICAL :: check_INPUTS = .FALSE.         !! (very) long print of INPUTs in intersurf 
+  LOGICAL, PARAMETER :: check_INPUTS = .FALSE.         !! (very) long print of INPUTs in intersurf 
   LOGICAL, SAVE :: OFF_LINE_MODE = .FALSE. 
+  LOGICAL, SAVE :: check_time = .FALSE.
+  PUBLIC check_time, l_first_intersurf
   !
 !!$ DS : ajout du flag IMPOSE_PARAM
@@ -2650 +2652 @@
     REAL(r_std), INTENT(in)                     :: dt        !! Time step
     !
-    ! LOCAL
-    LOGICAL     :: check=.FALSE.
 
     IF (l_first_intersurf) THEN
@@ -2663 +2663 @@
        ENDIF
 
-       IF (check) THEN
+       IF (check_time) THEN
           write(numout,*) "calendar_str =",calendar_str
           write(numout,*) "one_year=",one_year,", one_day=",one_day
@@ -2671 +2671 @@
 
     !
-    IF (check) &
+    IF (check_time) &
          WRITE(numout,*) "---" 
     ! Dans diffuco (ie date0 == date0_shift !!) 
@@ -2685 +2685 @@
 !!$       julian_diff = in_julian
 !!$       month_len = ioget_mon_len (year,month)
-!!$       IF (check) THEN
+!!$       IF (check_time) THEN
 !!$          write(numout,*) "in_julian, jur, julian_diff=",in_julian, jur, julian_diff
 !!$          write(numout,*) 'DATE ymds', year, month,'(',month_len,'d)', day, sec, '-- stp --', istp
@@ -2697 +2697 @@
        sec = NINT((julian_diff-REAL(INT(julian_diff)))*one_day)
        month_len = ioget_mon_len (year,month)
-       IF (check) THEN
+       IF (check_time) THEN
           write(numout,*) "2 in_julian, julian0, julian_diff=",in_julian, julian0, julian_diff
           write(numout,*) '2 DATE ymds', year, month,'(',month_len,'d)', day, sec, '-- stp --', istp
@@ -2707 +2707 @@
 !!$       julian_diff = in_julian
 !!$       month_len = ioget_mon_len (year,month)
-!!$       IF (check) THEN
+!!$       IF (check_time) THEN
 !!$          write(numout,*) "in_julian=",in_julian, jur, julian_diff
 !!$          write(numout,*) 'DATE ymds', year, month,'(',month_len,'d)', day, sec, '-- stp --', istp
@@ -2719 +2719 @@
 !!$       sec = NINT((julian_diff-REAL(INT(julian_diff)))*one_day)
 !!$       month_len = ioget_mon_len (year,month)
-!!$       IF (check) THEN
+!!$       IF (check_time) THEN
 !!$          write(numout,*) "2 in_julian, jur, julian_diff=",in_julian, jur, julian_diff
 !!$          write(numout,*) '2 DATE ymds', year, month,'(',month_len,'d)', day, sec, '-- stp --', istp
@@ -2725 +2725 @@
 
 
-!!$       IF (check) &
+!!$       IF (check_time) &
 !!$            WRITE(numout,*) "-"
 
@@ -2736 +2736 @@
        julian_diff = in_julian
        month_len = ioget_mon_len (year,month)
-       IF (check) THEN
+       IF (check_time) THEN
           write(numout,*) "in_julian=",in_julian, julian0, julian_diff
           write(numout,*) 'DATE ymds', year, month,'(',month_len,'d)', day, sec, '-- stp --', istp
        ENDIF
     ENDIF
-!!$    IF (check) &
+!!$    IF (check_time) &
 !!$         WRITE(numout,*) "---"