Changeset 2368 for branches/nemo_v3_3_beta/NEMOGCM/EXTERNAL/IOIPSL/src/histcom.f90

Timestamp:

2010-11-09T16:38:45+01:00 (14 years ago)

Author:

acc

Message:

nemo_v3_3_beta. Changes to code relating to key_netcdf4 option to provide more robust compilation. See #755 and #754

File:

• branches/nemo_v3_3_beta/NEMOGCM/EXTERNAL/IOIPSL/src/histcom.f90 (modified) (4 diffs)

branches/nemo_v3_3_beta/NEMOGCM/EXTERNAL/IOIPSL/src/histcom.f90

@@ -7 +7 @@
 !-
   USE netcdf
-  USE nc4dummy ! needed to allow compilation with netcdf3 libraries
+  USE nc4interface ! needed to allow compilation with netcdf3 libraries
 !-
   USE stringop, ONLY : nocomma,cmpblank,findpos,find_str,strlowercase
@@ -36 +36 @@
 !- to describe the grid, just two vectors.
 !---------------------------------------------------------------------
-!-
-  TYPE, PUBLIC :: snc4_ctl    !: netcdf4 chunking control structure 
-                              !: (optional on histbeg and histend calls)
-     SEQUENCE
-     INTEGER :: ni
-     INTEGER :: nj
-     INTEGER :: nk
-     LOGICAL :: luse
-  END TYPE snc4_ctl
 !-
   INTERFACE histbeg
@@ -428 +419 @@
 !-
   IF (PRESENT(snc4chunks)) THEN
-    IF (snc4chunks%luse) m_c = NF90_HDF5  ! will conflict if compiling with netcdf4 libraries without "key_netcdf4"
+    IF (snc4chunks%luse) CALL get_nf90_symbol("NF90_HDF5", m_c)
   ENDIF
 !-
@@ -1564 +1555 @@
            ichunksz(3) = MIN(ichunksz(3), MAX((ichunksz(3)-1)/snc4chunks%nk + 1, 1))
            ! Always use a chunk size of 1 for the unlimited dimension
-           iret = NF90_DEF_VAR_CHUNKING(nfid, nvid, ichunkalg, ichunksz) ! will conflict if compiling with netcdf4 libraries without "key_netcdf4"
-
-           iret = NF90_DEF_VAR_DEFLATE(nfid, nvid, ishuffle, ideflate, ideflate_level) ! will conflict if compiling with netcdf4 libraries without "key_netcdf4"
-
+           iret = SET_NF90_DEF_VAR_CHUNKING(nfid, nvid, ichunkalg, ichunksz)
+           iret = SET_NF90_DEF_VAR_DEFLATE(nfid, nvid, ishuffle, ideflate, ideflate_level)
           ENDIF
         ENDIF