Changeset 806 for IOIPSL/trunk

Timestamp:

11/23/09 13:10:35 (15 years ago)

Author:

bellier

Message:

Added optional argument "standard_name" to histdef

File:

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

IOIPSL/trunk/src/histcom.f90

@@ -86 +86 @@
   INTEGER :: nbopp
   CHARACTER(LEN=20) :: v_name,unit_name
-  CHARACTER(LEN=80) :: title,fullop
+  CHARACTER(LEN=80) :: title,std_name,fullop
   CHARACTER(LEN=7)  :: topp
   CHARACTER(LEN=7),DIMENSION(nbopp_max) :: sopps
@@ -1092 +1092 @@
 END SUBROUTINE histvert
 !===
-SUBROUTINE histdef (pfileid,pvarname,ptitle,punit, &
- &                  pxsize,pysize,phoriid,pzsize,  &
- &                  par_oriz,par_szz,pzid,         &
- &                  pnbbyt,popp,pfreq_opp,pfreq_wrt,var_range)
+SUBROUTINE histdef &
+ &  (pfileid,pvarname,ptitle,punit, &
+ &   pxsize,pysize,phoriid,pzsize,par_oriz,par_szz,pzid, &
+ &   xtype,popp,pfreq_opp,pfreq_wrt,var_range,standard_name)
 !---------------------------------------------------------------------
 !- With this subroutine each variable to be archived on the history
@@ -1130 +1130 @@
 !- pzid     : ID of the vertical axis to use. It has to have
 !-            the size of the zoom.
-!- pnbbyt   : External netCDF type (hist_r4/hist_r8)
+!- xtype    : External netCDF type (hist_r4/hist_r8)
 !- popp     : Operation to be performed. The following options
 !-            exist today :
@@ -1147 +1147 @@
 !-
   INTEGER,INTENT(IN) :: pfileid,pxsize,pysize,pzsize,pzid
-  INTEGER,INTENT(IN) :: par_oriz,par_szz,pnbbyt,phoriid
+  INTEGER,INTENT(IN) :: par_oriz,par_szz,xtype,phoriid
   CHARACTER(LEN=*),INTENT(IN) :: pvarname,punit,popp,ptitle
   REAL,INTENT(IN) :: pfreq_opp,pfreq_wrt
   REAL,DIMENSION(2),OPTIONAL,INTENT(IN) :: var_range
+  CHARACTER(LEN=*),OPTIONAL,INTENT(IN) :: standard_name
 !-
   INTEGER :: iv,i
@@ -1200 +1201 @@
   W_F(pfileid)%W_V(iv)%title = ptitle
   W_F(pfileid)%W_V(iv)%unit_name = punit
+  IF (PRESENT(standard_name)) THEN
+    W_F(pfileid)%W_V(iv)%std_name = standard_name
+  ELSE
+    W_F(pfileid)%W_V(iv)%std_name = ptitle
+  ENDIF
   tmp_name = W_F(pfileid)%W_V(iv)%v_name
 !-
@@ -1228 +1234 @@
 ! 1.3 External type of the variable
 !-
-  IF (pnbbyt == hist_r8) THEN
+  IF (xtype == hist_r8) THEN
     W_F(pfileid)%W_V(iv)%v_typ = hist_r8
   ELSE
@@ -1664 +1670 @@
       ENDIF
       iret = NF90_PUT_ATT (nfid,nvid,'standard_name', &
- &                         TRIM(W_F(pfileid)%W_V(iv)%title))
+ &                         TRIM(W_F(pfileid)%W_V(iv)%std_name))
 !-
       iret = NF90_PUT_ATT (nfid,nvid,'_FillValue', &