Changeset 1808 for IOIPSL/trunk

Timestamp:

07/16/12 10:07:18 (12 years ago)

Author:

jpolcher

Message:

This modification of flincom.f90 treats 2 problems :

• the time axis was only recognized if the dimension was either called time_counter or tstep. The more natural name "time" was added as an option.
• The other change deals with scalar variables. For the moment flincom.f90 expects the scalar variables to be global attributes of the netCDF files. This was extended in the following way. If the scalar variable requested by the user is not found among the global attributes, then we look for it within the variables. If found we read that scalar variable.

Neither change modifies the default behaviot of flincom.f90 but it just extends its capabilities.

File:

• IOIPSL/trunk/src/flincom.f90 (modified) (3 diffs)

IOIPSL/trunk/src/flincom.f90

@@ -739 +739 @@
       zid = iv; llm = lll;
     ELSE IF (    (INDEX(axname,'tstep') == 1) &
+             .OR.(INDEX(axname,'time') == 1) &
              .OR.(INDEX(axname,'time_counter') == 1) ) THEN
 !---- For the time we certainly need to allow for other names
@@ -1678 +1679 @@
 ! LOCAL
 !-
-  INTEGER :: iret, fid
+  INTEGER :: iret, fid, vid
+  INTEGER :: attlen, attnum
+  INTEGER :: ndims, nb_atts
+  INTEGER,DIMENSION(NF90_MAX_VAR_DIMS) :: dimids
+  LOGICAL :: var_exists
 !-
   LOGICAL :: l_dbg
@@ -1685 +1690 @@
 
   IF (l_dbg) THEN
-    WRITE (*,*) 'flinget_scal in file with id ',fid_in
+    WRITE (ipslout,*) 'flinget_scal in file with id ',fid_in
   ENDIF
 !-
   fid = ncids(fid_in)
+  iret = NF90_INQUIRE_ATTRIBUTE(fid, NF90_GLOBAL, varname, len=attlen, attnum=attnum)
 !-
 ! 1.0 Reading a global attribute
 !-
-  iret = NF90_GET_ATT (fid, NF90_GLOBAL, varname, var)
+  IF ( iret == nf90_noerr ) THEN
+     !
+     ! This seems to be a Global attribute
+     !
+     iret = NF90_GET_ATT (fid, NF90_GLOBAL, varname, var)
+  ELSE
+     !
+     ! If there was an error on the test for a global attribute it
+     ! is perhaps a scalar variable.
+     !
+     vid = -1
+     iret = NF90_INQ_VARID (fid, varname, vid)
+     !
+     IF ( (vid >= 0).AND.(iret == NF90_NOERR) ) THEN
+        iret = NF90_INQUIRE_VARIABLE (fid, vid, &
+             ndims=ndims, dimids=dimids, nAtts=nb_atts)
+        IF ( (ndims == 0) .AND. (nb_atts >= 0) ) THEN
+           iret = NF90_GET_VAR(fid, vid, var)
+        ELSE
+           CALL histerr (3,'flinget_scal', &
+                'The variable has coordinates and thus is probably not a scalar.', &
+                'Check your netCDF file.', " ")
+        ENDIF
+     ENDIF
+     IF (l_dbg) THEN
+        WRITE(ipslout,*) "Reading a Scalar value for varibale ", varname," It has value ", var
+     ENDIF
+  ENDIF
+!-
 !---------------------------
 END  SUBROUTINE flinget_scal