add %open,%close for ease of typing

Author: scivision

Examples/example1.f90

@@ -9,12 +9,12 @@ program example1
 
 filename = 'nc4fortran_example1.nc'
 
-call h%initialize(filename, status='replace')
+call h%open(filename, status='replace')
 
 call h%write( 'x', 123)
 
 call h%read('x', i32)
-call h%finalize()
+call h%close()
 
 if (i32 /= 123) error stop 'incorrect value read'
 

Examples/example2.f90

@@ -10,11 +10,11 @@ program example2
 
 filename = 'nc4fortran_example2.nc'
 
-call h%initialize(filename, status='replace')
+call h%open(filename, status='replace')
 call h%write('x', 123)
-call h%finalize()
+call h%close()
 
-call h%initialize(filename, status='old', action='r')
+call h%open(filename, status='old', action='r')
 call h%read('x', i32)
 if (i32 /= 123) error stop 'incorrect value read'
 

Examples/fortran_interface.f90

@@ -15,9 +15,9 @@ subroutine write_int32(filename, var_name, i32) bind(C)
 integer(C_INT32_T), intent(in) :: i32
 type(netcdf_file) :: h
 
-call h%initialize(cstr2fstr(filename), status='replace')
+call h%open(cstr2fstr(filename), status='replace')
 call h%write(cstr2fstr(var_name), i32)
-call h%finalize()
+call h%close()
 
 end subroutine write_int32
 
@@ -28,9 +28,9 @@ subroutine read_int32(filename, var_name, i32) bind(C)
 integer(C_INT32_T), intent(out) :: i32
 type(netcdf_file) :: h
 
-call h%initialize(cstr2fstr(filename), status='old', action='r')
+call h%open(cstr2fstr(filename), status='old', action='r')
 call h%read(cstr2fstr(var_name), i32)
-call h%finalize()
+call h%close()
 
 end subroutine read_int32
 

README.md

@@ -140,16 +140,16 @@ If `ierr` is omitted, nc4fortran will `error stop` on error.
 ### Create new NetCDF file, with variable "value1"
 
 ```fortran
-call hf%initialize('test.nc', status='new')
+call hf%open('test.nc', status='new')
 
 call hf%write('value1', 123.)
 
-call hf%finalize()
+call hf%close()
 ```
 
 ### Check if variable exists
 
-This will not raise error stop, even if the file isn't initialized, but it will print a message to stderr.
+This will not raise error stop, even if the file isn't opened, but it will print a message to stderr.
 
 ```fortran
 logical :: exists
@@ -163,17 +163,17 @@ exists = hf%exist('fooname')
 * if file `test.nc` does not exist, create it and add a variable to it.
 
 ```fortran
-call hf%initialize('test.nc', status='unknown',action='rw')
+call hf%open('test.nc', status='unknown',action='rw')
 
 call hf%write('value1', 123.)
 
-call hf%finalize()
+call hf%close()
 ```
 
 ### Read scalar, 3-D array of unknown size
 
 ```fortran
-call ncf%initialize('test.nc', status='old',action='r')
+call ncf%open('test.nc', status='old',action='r')
 
 integer, allocatable :: dims(:)
 real, allocatable :: A(:,:,:)
@@ -182,7 +182,7 @@ call ncf%shape('foo', dims)
 allocate(A(dims(1), dims(2), dims(3)))
 call ncf%read('foo', A)
 
-call ncf%finalize()
+call ncf%close()
 ```
 
 ## Permissive syntax

VERSION

@@ -1 +1 @@
-1.2.6
+1.3.0

src/interface.f90

@@ -34,7 +34,8 @@ module nc4fortran
 contains
 
 !> methods used directly without type/rank agnosticism
-procedure, public :: initialize => nc_initialize, finalize => nc_finalize, &
+procedure, public :: initialize => nc_initialize, open => nc_initialize, &
+  finalize => nc_finalize, close => nc_finalize, &
   shape => get_shape, ndims => get_ndims, write_attribute, read_attribute, flush=>nc_flush, &
   exist=>nc_check_exist, exists=>nc_check_exist, &
   is_chunked, is_contig, chunks=>get_chunk
@@ -469,7 +470,7 @@ subroutine nc_initialize(self,filename,ierr, status,action,comp_lvl,verbose,debu
 character(*), intent(in), optional :: status
 character(*), intent(in), optional :: action
 integer, intent(in), optional :: comp_lvl
-logical, intent(in), optional      :: verbose, debug
+logical, intent(in), optional :: verbose, debug
 
 character(:), allocatable :: lstatus, laction
 integer :: ier

src/read.f90

@@ -68,7 +68,7 @@
 case (NF90_NOERR)
   exists = .true.
 case (NF90_EBADID)
-  write(stderr,*) 'check_exist: ERROR: is file initialized?  ', self%filename
+  write(stderr,*) 'check_exist: ERROR: is file opened?  ', self%filename
 case (NF90_ENOTVAR)
   if (self%verbose) write(stderr,*) dname, ' does not exist in ', self%filename
 case default
@@ -82,9 +82,9 @@
 
 type(netcdf_file) :: h
 
-call h%initialize(filename, status='old', action='r')
+call h%open(filename, status='old', action='r')
 nc_exist = h%exist(dname)
-call h%finalize()
+call h%close()
 
 end procedure nc_exist
 

src/tests/test_array.f90

@@ -41,7 +41,7 @@ subroutine test_basic_array()
 r1 = i1
 r2 = i2
 
-call h%initialize(filename, status='replace', comp_lvl=1)
+call h%open(filename, status='replace', comp_lvl=1)
 
 call h%write('int32-1d', i1)
 call h%write('int32-2d', i2, ['x', 'y'])
@@ -57,10 +57,10 @@ subroutine test_basic_array()
 call h%write('int32-1d', i2, ierr=ierr)
 if(ierr==0) error stop 'test_write_array: did not error for write array rank mismatch'
 
-call h%finalize()
+call h%close()
 
 !! read
-call h%initialize(filename, status='old', action='r')
+call h%open(filename, status='old', action='r')
 
 !> int32
 call h%read('int32-1d', i1t)
@@ -96,7 +96,7 @@ subroutine test_basic_array()
 call h%read('nan',nant)
 if (.not.ieee_is_nan(nant)) error stop 'failed storing or reading NaN'
 
-call h%finalize()
+call h%close()
 
 end subroutine test_basic_array
 

src/tests/test_attributes.f90

@@ -20,7 +20,7 @@ subroutine test_write_attributes(path)
 type(netcdf_file) :: h
 character(*), intent(in) :: path
 
-call h%initialize(path, status='replace')
+call h%open(path, status='replace')
 
 call h%write('x', 1)
 
@@ -30,7 +30,7 @@ subroutine test_write_attributes(path)
 call h%write_attribute('x', 'life_float', 42._real32)
 call h%write_attribute('x', 'life_double', 42._real64)
 
-call h%finalize()
+call h%close()
 
 end subroutine test_write_attributes
 
@@ -46,7 +46,7 @@ subroutine test_read_attributes(path)
 
 integer :: x
 
-call h%initialize(path, status='old', action='r')
+call h%open(path, status='old', action='r')
 
 call h%read('x', x)
 if (x/=1) error stop 'read_attribute: unexpected value'
@@ -63,7 +63,7 @@ subroutine test_read_attributes(path)
 call h%read_attribute('x', 'life_double', attr64)
 if (attr64 /= 42._real64) error stop 'read_attribute: real64'
 
-call h%finalize()
+call h%close()
 
 end subroutine test_read_attributes
 

src/tests/test_deflate.f90

@@ -23,20 +23,20 @@ program deflate_test
 big2 = 0
 big3 = 0
 
-call h%initialize(fn1, status='replace', comp_lvl=1, debug=.true.)
+call h%open(fn1, status='replace', comp_lvl=1, debug=.true.)
 call h%write('big2', big2, dims=['x','y'])
 call h%flush()
 !> turn compression off for following variables (must flush first)
 h%comp_lvl = 0
 call h%write('small_contig', big2(:5,:5), dims=['q','r'])
-call h%finalize()
+call h%close()
 
 inquire(file=fn1, size=fsize)
 crat = (N*N*storage_size(big2)/8) / fsize
 print '(A,F6.2,A,I6)','#1 filesize (Mbytes): ',fsize/1e6, '   2D compression ratio:',crat
 if (crat < 10) error stop '#1 2D low compression'
 
-call h%initialize(fn1, status='old', action='r', debug=.false.)
+call h%open(fn1, status='old', action='r', debug=.false.)
 
 if(.not. h%is_chunked('big2')) error stop '#1 not chunked layout'
 
@@ -50,11 +50,11 @@ program deflate_test
 call h%chunks('small_contig', chunks(:2))
 if(any(chunks(:2) /= -1)) error stop '#1 get_chunk mismatch'
 
-call h%finalize()
+call h%close()
 
 ! ======================================
 
-call h%initialize(fn2, status='replace',comp_lvl=1, debug=.true.)
+call h%open(fn2, status='replace',comp_lvl=1, debug=.true.)
 call h%write('big3', big3)
 
 call h%write('big3_autochunk', big3)
@@ -64,7 +64,7 @@ program deflate_test
   write(stderr,*) '#2 chunk size', chunks
   error stop '#2 auto chunk unexpected chunk size'
 endif
-call h%finalize()
+call h%close()
 
 inquire(file=fn2, size=fsize)
 crat = (2*N*N*storage_size(big3)/8) / fsize
@@ -73,25 +73,25 @@ program deflate_test
 
 ! ======================================
 
-call h%initialize(fn3, status='replace',comp_lvl=1, debug=.true.)
+call h%open(fn3, status='replace',comp_lvl=1, debug=.true.)
 
 call h%write('ibig3', ibig3(:N-10,:N-20,:))
 call h%chunks('ibig3', chunks)
 if(any(chunks(:2) /= [N-10, N-20]))  then
   write(stderr,*) '#3 chunk size', chunks
   error stop '#3 auto chunk unexpected chunk size'
 endif
-call h%finalize()
+call h%close()
 
 inquire(file=fn3, size=fsize)
 crat = (N*N*storage_size(ibig3)/8) / fsize
 print '(A,F6.2,A,I6)','#3 filesize (Mbytes): ',fsize/1e6, '   3D compression ratio:',crat
 if (h%comp_lvl > 0 .and. crat < 10) error stop '#3 3D low compression'
 ! !======================================
 
-call h%initialize(fn4, status='replace', comp_lvl=1, debug=.true.)
+call h%open(fn4, status='replace', comp_lvl=1, debug=.true.)
 call h%write('ibig2', ibig2)
-call h%finalize()
+call h%close()
 
 inquire(file=fn4, size=fsize)
 crat = (N*N*storage_size(ibig2)/8) / fsize