Changeset 75 for IOIPSL/trunk

Timestamp:

06/25/07 14:19:52 (17 years ago)

Author:

bellier

Message:

JB: new version of histcom (min-max values) and test

Location:

IOIPSL/trunk

Files:

• example/testhist1.f90 (modified) (1 diff)
• src/histcom.f90 (modified) (11 diffs)

IOIPSL/trunk/example/testhist1.f90

@@ -68 +68 @@
 !-
   CALL histdef (id,"champ1","Some field","m", &
- &       iim,jjm,hori_id,1,1,1,-99,32,"inst(scatter(x))",dt_op,dt_wrt)
+ &       iim,jjm,hori_id,1,1,1,-99,32,"inst(scatter(x))", &
+ &       dt_op,dt_wrt,var_range=(/1.,-1./))
 !-
   CALL histdef (id,"champ2","Another field","m", &
  &       iim,jjm,hori_id,llm,1,llm,sig_id,32,"t_max(max(x,1.0)*2)", &
- &       deltat,dt_wrt)
+ &       deltat,dt_wrt,var_range=(/0.,90./))
 !-
   CALL histdef (id,"champ3","A field without time","m", &

IOIPSL/trunk/src/histcom.f90

@@ -73 +73 @@
   INTEGER,PARAMETER :: nb_files_max=20, nb_var_max=400, &
  &                     nb_hax_max=5, nb_zax_max=10, nbopp_max=10
-  REAL,PARAMETER :: missing_val=1.e20
-!-                 or HUGE(1.0) maximum real number
+  REAL,PARAMETER :: missing_val=nf90_fill_real
 !-
   INTEGER :: bufftmp_max(nb_files_max) = 1
@@ -131 +130 @@
  &  var_haxid,var_zaxid,var_axid,ncvar_ids
 !-
-  REAL,SAVE :: minmax(nb_files_max,nb_var_max,2)
+  REAL,DIMENSION(nb_files_max,nb_var_max,2),SAVE :: hist_minmax
+  LOGICAL,DIMENSION(nb_files_max,nb_var_max),SAVE :: &
+ &  hist_calc_rng=.FALSE.,hist_wrt_rng=.FALSE.
 !-
   REAL,DIMENSION(nb_files_max,nb_var_max),SAVE :: &
@@ -976 +977 @@
   REAL,INTENT(IN) :: pzvalues(pzsize)
   INTEGER, INTENT(OUT) :: pzaxid
-  CHARACTER(LEN=*),INTENT(IN), OPTIONAL :: pdirect
+  CHARACTER(LEN=*),INTENT(IN),OPTIONAL :: pdirect
 !-
   INTEGER :: pos, iv, nb, zdimid, zaxid_tmp
@@ -1093 +1094 @@
  &                  pxsize, pysize, phoriid, pzsize,  &
  &                  par_oriz, par_szz, pzid,          &
- &                  pnbbyt, popp, pfreq_opp, pfreq_wrt)
+ &                  pnbbyt, popp, pfreq_opp, pfreq_wrt, var_range)
 !---------------------------------------------------------------------
 !- With this subroutine each variable to be archived on the history
@@ -1136 +1137 @@
 !- pfreq_wrt: Frequency at which the variable should be
 !-            written (in seconds)
+!- var_range: Range of the variable.
+!-            If the minimum is greater than the maximum,
+!-            the values will be calculated.
 !-
 !- VERSION
@@ -1146 +1150 @@
   CHARACTER(LEN=*),INTENT(IN) :: ptitle
   REAL,INTENT(IN) :: pfreq_opp, pfreq_wrt
+  REAL,DIMENSION(2),OPTIONAL,INTENT(IN) :: var_range
 !-
   INTEGER :: iv, i, nb
@@ -1437 +1442 @@
   IF (check) WRITE(*,*) "histdef : 5.0"
 !-
-  minmax(pfileid,iv,1) =  ABS(missing_val)
-  minmax(pfileid,iv,2) = -ABS(missing_val)
-!-
-  last_opp(pfileid,iv) = itau0(pfileid)       ! - freq_opp(pfileid,iv)/2./deltat(pfileid)
-  last_wrt(pfileid,iv) = itau0(pfileid)       ! - freq_wrt(pfileid,iv)/2./deltat(pfileid)
-  last_opp_chk(pfileid,iv) = itau0(pfileid)   ! - freq_opp(pfileid,iv)/2./deltat(pfileid)
-  last_wrt_chk(pfileid,iv) = itau0(pfileid)   ! - freq_wrt(pfileid,iv)/2./deltat(pfileid)
+  hist_wrt_rng(pfileid,iv) = (PRESENT(var_range))
+  IF (hist_wrt_rng(pfileid,iv)) THEN
+    hist_calc_rng(pfileid,iv) = (var_range(1) > var_range(2))
+    IF (hist_calc_rng(pfileid,iv)) THEN
+      hist_minmax(pfileid,iv,1:2) = &
+ &      (/ ABS(missing_val), -ABS(missing_val) /)
+    ELSE
+      hist_minmax(pfileid,iv,1:2) = var_range(1:2)
+    ENDIF
+  ENDIF
+!-
+! - freq_opp(pfileid,iv)/2./deltat(pfileid)
+  last_opp(pfileid,iv) = itau0(pfileid)
+! - freq_wrt(pfileid,iv)/2./deltat(pfileid)
+  last_wrt(pfileid,iv) = itau0(pfileid)
+! - freq_opp(pfileid,iv)/2./deltat(pfileid)
+  last_opp_chk(pfileid,iv) = itau0(pfileid)
+! - freq_wrt(pfileid,iv)/2./deltat(pfileid)
+  last_wrt_chk(pfileid,iv) = itau0(pfileid)
   nb_opp(pfileid,iv) = 0
   nb_wrt(pfileid,iv) = 0
@@ -1650 +1667 @@
       iret = NF90_PUT_ATT (ncid,ncvarid,'missing_value', &
  &                         REAL(missing_val,KIND=4))
-      iret = NF90_PUT_ATT (ncid,ncvarid,'valid_min', &
- &                         REAL(minmax(pfileid,iv,1),KIND=4))
-      iret = NF90_PUT_ATT (ncid,ncvarid,'valid_max', &
- &                         REAL(minmax(pfileid,iv,2),KIND=4))
+      IF (hist_wrt_rng(pfileid,iv)) THEN
+        iret = NF90_PUT_ATT (ncid,ncvarid,'valid_min', &
+ &                           REAL(hist_minmax(pfileid,iv,1),KIND=4))
+        iret = NF90_PUT_ATT (ncid,ncvarid,'valid_max', &
+ &                           REAL(hist_minmax(pfileid,iv,2),KIND=4))
+      ENDIF
 !-
       iret = NF90_PUT_ATT (ncid,ncvarid,'long_name',TRIM(ttitle))
@@ -2174 +2193 @@
   REAL :: rtime
   CHARACTER(LEN=7) :: tmp_opp
-  REAL :: mindata, maxdata
   REAL,ALLOCATABLE,SAVE :: buff_tmp2(:)
   INTEGER,SAVE          :: buff_tmp2_sz
   REAL,ALLOCATABLE,SAVE :: buffer_used(:)
   INTEGER,SAVE          :: buffer_sz
-!-xx  INTEGER :: ji
 !-
   LOGICAL :: check = .FALSE.
@@ -2304 +2321 @@
  &    TRIM(tmp_opp),'----',LEN_TRIM(tmp_opp),nbindex
 !-
-    mindata =  ABS(missing_val)
-    maxdata = -ABS(missing_val)
-!-xx DO ji=1,tsz
-!-xx   IF (buff_tmp2(ji)/= missing_val) THEN
-!-xx     mindata = MIN(mindata, buff_tmp2(ji))
-!-xx     maxdata = MAX(maxdata, buff_tmp2(ji))
-!-xx   ENDIF
-!-xx ENDDO
-!-??
-!-??   mindata = MINVAL(buff_tmp2(1:tsz),
-!-?? &                  MASK = buff_tmp2(1:tsz) /= missing_val)
-!-??   maxdata = MAXVAL(buff_tmp2(1:tsz),
-!-?? &                  MASK = buff_tmp2(1:tsz) /= missing_val)
-!-??
-    minmax(pfileid,varid,1) = mindata
-    minmax(pfileid,varid,2) = maxdata
+    IF (hist_calc_rng(pfileid,varid)) THEN
+      hist_minmax(pfileid,varid,1) = &
+ &      MIN(hist_minmax(pfileid,varid,1), &
+ &      MINVAL(buff_tmp2(1:tsz),MASK=buff_tmp2(1:tsz) /= missing_val))
+      hist_minmax(pfileid,varid,2) = &
+ &      MAX(hist_minmax(pfileid,varid,2), &
+ &      MAXVAL(buff_tmp2(1:tsz),MASK=buff_tmp2(1:tsz) /= missing_val))
+    ENDIF
 !-
 !-- 5.0 Do the operations if needed. In the case of instantaneous
@@ -2675 +2684 @@
     IF ( check ) WRITE(*,*) 'Entering loop on vars :', nb_var(ifile)
     DO iv = 1,nb_var(ifile)
-      ncvarid = ncvar_ids(ifile,iv)
-      IF (check) THEN
-        WRITE(*,*) 'min value for file :',ifile,' var n. :',iv, &
-       &           ' is : ',minmax(ifile,iv,1)
-        WRITE(*,*) 'max value for file :',ifile,' var n. :',iv, &
-       &           ' is : ',minmax(ifile,iv,2)
+      IF (hist_wrt_rng(ifile,iv)) THEN
+        IF (check) THEN
+          WRITE(*,*) 'min value for file :',ifile,' var n. :',iv, &
+         &           ' is : ',hist_minmax(ifile,iv,1)
+          WRITE(*,*) 'max value for file :',ifile,' var n. :',iv, &
+         &           ' is : ',hist_minmax(ifile,iv,2)
+        ENDIF
+        IF (hist_calc_rng(ifile,iv)) THEN
+!-------- 1.1 Put the min and max values on the file
+          ncvarid = ncvar_ids(ifile,iv)
+          iret = NF90_PUT_ATT (ncid,ncvarid,'valid_min', &
+ &                             REAL(hist_minmax(ifile,iv,1),KIND=4))
+          iret = NF90_PUT_ATT (ncid,ncvarid,'valid_max', &
+ &                             REAL(hist_minmax(ifile,iv,2),KIND=4))
+        ENDIF
       ENDIF
-!-
-!---- 1.1 Put the min and max values on the file
-!-
-      iret = NF90_PUT_ATT (ncid,ncvarid,'valid_min', &
- &                         REAL(minmax(ifile,iv,1),KIND=4))
-      iret = NF90_PUT_ATT (ncid,ncvarid,'valid_max', &
- &                         REAL(minmax(ifile,iv,2),KIND=4))
     ENDDO
 !-