Changeset 1023 for IOIPSL/trunk

Timestamp:

05/18/10 12:27:11 (14 years ago)

Author:

bellier

Message:

New version with bounds for reductive time operations

File:

• IOIPSL/trunk/src/histcom.f90 (modified) (11 diffs)

IOIPSL/trunk/src/histcom.f90

@@ -104 +104 @@
   LOGICAL :: hist_calc_rng=.FALSE.,hist_wrt_rng=.FALSE.
 !-Book keeping of the axes
-  INTEGER :: tdimid,tax_last
+  INTEGER :: tdimid,tbndid=-1,tax_last
+  LOGICAL :: l_bnd
   CHARACTER(LEN=40) :: tax_name
 !-
@@ -127 +128 @@
 !-Counter of elements (variables, time-horizontal-vertical axis
   INTEGER :: n_var=0,n_tax=0,n_hax=0,n_zax=0
-!-NETCDF dimension IDs for time-longitude-latitude
-  INTEGER :: tid,xid,yid
+!-NETCDF dimension IDs for time-[time_bounds]-longitude-latitude
+  INTEGER :: tid,bid,xid,yid
 !-General definitions in the NETCDF file
   INTEGER,DIMENSION(2) :: full_size=0,slab_ori,slab_siz
@@ -1321 +1322 @@
     IF (pos < 0) THEN
       W_F(idf)%n_tax = W_F(idf)%n_tax+1
+      W_F(idf)%W_V(iv)%l_bnd = &
+ &      (TRIM(W_F(idf)%W_V(iv)%topp) /= 'inst')
       W_F(idf)%W_V(W_F(idf)%n_tax)%tax_name = str40
       W_F(idf)%W_V(W_F(idf)%n_tax)%tax_last = 0
@@ -1367 +1370 @@
   REAL :: rtime0
   CHARACTER(LEN=30) :: str30
+  CHARACTER(LEN=35) :: str35
   CHARACTER(LEN=120) :: assoc
   CHARACTER(LEN=70) :: str70
@@ -1373 +1377 @@
  &     'JUL','AUG','SEP','OCT','NOV','DEC' /)
   CHARACTER(LEN=7) :: tmp_opp
+  LOGICAL :: l_b
   LOGICAL :: l_dbg
 !---------------------------------------------------------------------
@@ -1382 +1387 @@
 !-
   IF (l_dbg) WRITE(*,*) "histend : 1.0"
-!---
+!-
+! 1.1 Define the time dimensions needed for this file
+!-
   iret = NF90_DEF_DIM (nfid,'time_counter', &
  &                     NF90_UNLIMITED,W_F(idf)%tid)
-!-
-! 1.1 Define all the time axes needed for this file
+  DO iv=1,W_F(idf)%n_var
+    IF (W_F(idf)%W_V(iv)%l_bnd) THEN
+      iret = NF90_DEF_DIM (nfid,'tbnds',2,W_F(idf)%bid)
+      EXIT
+    ENDIF
+  ENDDO
+!-
+! 1.2 Define all the time axes needed for this file
 !-
   DO itx=1,W_F(idf)%n_tax
     dims(1) = W_F(idf)%tid
+    l_b = (INDEX(W_F(idf)%W_V(itx)%tax_name,"t_op_") == 1)
     IF (W_F(idf)%n_tax > 1) THEN
       str30 = W_F(idf)%W_V(itx)%tax_name
     ELSE
       str30 = "time_counter"
+    ENDIF
+    IF (l_b) THEN
+      str35 = TRIM(str30)//'_bnds'
     ENDIF
     iret = NF90_DEF_VAR (nfid,TRIM(str30),NF90_REAL8, &
@@ -1445 +1462 @@
     iret = NF90_PUT_ATT (nfid,W_F(idf)%W_V(itx)%tdimid, &
  &           'time_origin',TRIM(str70))
+!---
+    IF (l_b) THEN
+      iret = NF90_PUT_ATT (nfid,W_F(idf)%W_V(itx)%tdimid, &
+ &             'bounds',TRIM(str35))
+      dims(1:2) = (/ W_F(idf)%bid,W_F(idf)%tid /)
+      iret = NF90_DEF_VAR (nfid,TRIM(str35),NF90_REAL8, &
+ &            dims(1:2),W_F(idf)%W_V(itx)%tbndid)
+    ENDIF
   ENDDO
 !-
@@ -1544 +1569 @@
       IF (itax > 0) THEN
         IF (W_F(idf)%n_tax > 1) THEN
-          str30 = "t_"//W_F(idf)%W_V(itax)%tax_name
+          str30 = W_F(idf)%W_V(itax)%tax_name
         ELSE
           str30 = "time_counter"
@@ -1839 +1864 @@
 !-
   REAL :: rtime
+  REAL,DIMENSION(2) :: t_bnd
   CHARACTER(LEN=7) :: tmp_opp
   REAL,ALLOCATABLE,DIMENSION(:),SAVE :: tbf_2
@@ -2020 +2046 @@
     IF (     (TRIM(tmp_opp) /= "inst") &
  &      .AND.(TRIM(tmp_opp) /= "once") ) THEN
-      rtime = (rtime+W_F(idf)%W_V(iv)%last_wrt*W_F(idf)%deltat)/2.0
+      t_bnd(1:2) = (/ W_F(idf)%W_V(iv)%last_wrt*W_F(idf)%deltat,rtime /)
+      rtime = (t_bnd(1)+t_bnd(2))/2.0
     ENDIF
 !-
@@ -2037 +2064 @@
         iret = NF90_PUT_VAR (nfid,W_F(idf)%W_V(itax)%tdimid, &
  &               (/ rtime /),start=(/ itime /),count=(/ 1 /))
+        IF (W_F(idf)%W_V(itax)%tbndid > 0) THEN
+          iret = NF90_PUT_VAR (nfid,W_F(idf)%W_V(itax)%tbndid, &
+ &                 t_bnd,start=(/ 1,itime /),count=(/ 2,1 /))
+        ENDIF
         W_F(idf)%W_V(itax)%tax_last = itime
       ENDIF