Changeset 3474

Timestamp:

11/20/17 14:26:40 (7 years ago)

Author:

jgipsl

Message:

• Added exit in flinget if error when reading values from file
• Added possiblilty to use netcdf compression in restcom. Option is activated by adding optional argument use_compression when calling restini

Modifications done by A. Jornet-Puig, LSCE

Location:

IOIPSL/trunk/src

Files:

• flincom.f90 (modified) (2 diffs)
• restcom.f90 (modified) (8 diffs)

IOIPSL/trunk/src/flincom.f90

@@ -1613 +1613 @@
              start=w_sta(:), count=w_len(:))
 !---
+    IF (iret /= NF90_NOERR) THEN
+        WRITE(ipslout,*) 'flinget_mat 2.9 : ',NF90_STRERROR (iret)
+        CALL ipslerr(3, 'flinget_mat','Error on netcdf NF90_GET_VAR','', '')
+    ENDIF
+!---
     itau_len=itau_fin-itau_dep+1
     IF (l_dbg) WRITE(ipslout,*) 'flinget_mat 3.0 : clen, itau_len ',clen,itau_len
@@ -1631 +1636 @@
     iret = NF90_GET_VAR (fid, vid, var, &
              start=w_sta(:), count=w_len(:))
-  ENDIF
-!-
-  IF (l_dbg) WRITE(ipslout,*) 'flinget_mat 3.1 : ',NF90_STRERROR (iret)
+
+    IF (iret /= NF90_NOERR) THEN
+        WRITE(ipslout,*) 'flinget_mat 3.1 : ',NF90_STRERROR (iret)
+        CALL  ipslerr(3, 'flinget_mat','Error on netcdf NF90_GET_VAR','Read in netcdf failed', '')
+    ENDIF
+  ENDIF
+!-
+  IF (l_dbg) WRITE(ipslout,*) 'flinget_mat 3.2 : ',NF90_STRERROR (iret)
 !--------------------------
 END  SUBROUTINE flinget_mat

IOIPSL/trunk/src/restcom.f90

@@ -167 +167 @@
   REAL,ALLOCATABLE,DIMENSION(:),SAVE :: buff_tmp1,buff_tmp2
 !-
+! Compression
+!-
+  LOGICAL,SAVE :: IS_COMPRESSION_ENABLED = .FALSE.
+!-
 !===
 CONTAINS
@@ -173 +177 @@
 SUBROUTINE restini &
  & (fnamein,iim,jjm,lon,lat,llm,lev, &
- &  fnameout,itau,date0,dt,fid,owrite_time_in,domain_id )
+ &  fnameout,itau,date0,dt,fid,owrite_time_in, &
+ &  domain_id,use_compression)
 !---------------------------------------------------------------------
 !- This subroutine sets up all the restart process.
@@ -215 +220 @@
 !- Optional INPUT arguments
 !-
-!- owrite_time_in : logical  argument which allows to
-!-                  overwrite the time in the restart file
-!- domain_id      : Domain identifier
+!- owrite_time_in  : logical  argument which allows to
+!-                   overwrite the time in the restart file
+!- use_compression : Enable netcdf compression
+!- domain_id       : Domain identifier
 !-
 !---------------------------------------------------------------------
@@ -228 +234 @@
   LOGICAL,OPTIONAL :: owrite_time_in
   INTEGER,INTENT(IN),OPTIONAL :: domain_id
+  LOGICAL,OPTIONAL,INTENT(IN) :: use_compression
 !-
   INTEGER :: ncfid
@@ -244 +251 @@
   ELSE
     overwrite_time = owrite_time_in
+  ENDIF
+!-
+  IS_COMPRESSION_ENABLED = .FALSE. 
+  IF (PRESENT(use_compression) .AND. use_compression) THEN
+    IS_COMPRESSION_ENABLED = .TRUE.
   ENDIF
 !-
@@ -881 +893 @@
   ENDDO
 !-
-  iret = NF90_DEF_DIM(ncfid,'time',NF90_UNLIMITED,tdimid_out(fid))
+  iret = NF90_DEF_DIM(ncfid,'time',1,tdimid_out(fid))
 !-
 ! 1.0 Longitude
@@ -1779 +1791 @@
  &      .AND.(netcdf_id(fid,2) > 0) ) THEN
 !-----
-      CALL restdefv (fid,vname_q,list_dims,.FALSE.)
+      CALL restdefv (fid,vname_q,list_dims,.TRUE.)
 !-----
       DO ia = 1,varatt_in(fid,vnb)
@@ -2691 +2703 @@
     iret = NF90_PUT_ATT(ncfid,varid_out(fid,nbvar_out(fid)), &
  &                      'missing_value',REAL(missing_val,KIND=4))
+!---
+!   Compression
+    IF (IS_COMPRESSION_ENABLED) THEN
+      iret = NF90_DEF_VAR_DEFLATE(ncfid,varid_out(fid,nbvar_out(fid)),0,1,1) !DEFLATE_LEVEL_1
+      IF (iret /= NF90_NOERR) CALL ipslerr (3,'restdefv', &
+        'Could not add compression to new variable in file', &
+        NF90_STRERROR(iret),varname)
+    ENDIF
 !---
     IF (itau_out(fid) >= 0) THEN