remove open(status=) as it duplicates action= parameter

Author: scivision

CMakePresets.json

@@ -6,12 +6,17 @@
   "name": "default",
   "binaryDir": "${sourceDir}/build",
   "generator": "Ninja",
-  "cacheVariables": {"CMAKE_BUILD_TYPE": "Release"}
+  "cacheVariables": {
+    "CMAKE_BUILD_TYPE": "Release",
+    "CMAKE_INSTALL_PREFIX": "${sourceDir}/build"
+  }
 },
 {
   "name": "notest", "inherits": "default",
   "displayName": "omit self-tests",
-  "cacheVariables": {"BUILD_TESTING": false}
+  "cacheVariables": {
+    "BUILD_TESTING": false
+  }
 },
 {
   "name": "build", "inherits": "default",
@@ -23,24 +28,11 @@
 },
 {
   "name": "intel", "inherits": "default",
-  "displayName": "Intel Classic compiler: Linux/MacOS",
-  "environment": {
-    "CC": "icc",
-    "CXX": "icpc",
-    "FC": "ifort"
-  }
-},
-{
-  "name": "intelwin", "inherits": "intel",
-  "displayName": "Intel Classic compiler: Windows",
-  "environment": {
-    "CC": "icl",
-    "CXX": "icl"
-  }
-},
-{
-  "name": "intelnext", "inherits": "intel",
   "displayName": "Intel oneAPI LLVM",
+  "binaryDir": "${sourceDir}/build-intel",
+  "cacheVariables": {
+    "CMAKE_INSTALL_PREFIX": "${sourceDir}/build-intel"
+  },
   "environment": {
     "CC": "icx",
     "CXX": "icx",
@@ -52,6 +44,10 @@
   {
     "name": "default",
     "configurePreset": "default"
+  },
+  {
+    "name": "intel",
+    "configurePreset": "intel"
   }
 ],
 "testPresets": [
@@ -64,7 +60,12 @@
   },
   "execution": {
     "noTestsAction": "error",
-    "stopOnFailure": false}
+    "stopOnFailure": false
+  }
+},
+{
+  "name": "intel", "inherits": "default",
+  "configurePreset": "intel"
 }
 ]
 }

Examples/example1.f90

@@ -9,9 +9,9 @@ program example1
 
 filename = 'nc4fortran_example1.nc'
 
-call h%open(filename, status='replace')
+call h%open(filename, action='w')
 
-call h%write( 'x', 123)
+call h%write('x', 123)
 
 call h%read('x', i32)
 call h%close()

Examples/example2.f90

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

Examples/fortran_interface.f90

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

README.md

@@ -138,7 +138,7 @@ If `ierr` is omitted, nc4fortran will `error stop` on error.
 ### Create new NetCDF file, with variable "value1"
 
 ```fortran
-call hf%open('test.nc', status='new')
+call hf%open('test.nc', action='w')
 
 call hf%write('value1', 123.)
 
@@ -161,7 +161,7 @@ exists = hf%exist('fooname')
 * if file `test.nc` does not exist, create it and add a variable to it.
 
 ```fortran
-call hf%open('test.nc', status='unknown',action='rw')
+call hf%open('test.nc', action='rw')
 
 call hf%write('value1', 123.)
 
@@ -171,7 +171,7 @@ call hf%close()
 ### Read scalar, 3-D array of unknown size
 
 ```fortran
-call ncf%open('test.nc', status='old',action='r')
+call ncf%open('test.nc', action='r')
 
 integer, allocatable :: dims(:)
 real, allocatable :: A(:,:,:)
@@ -185,10 +185,10 @@ call ncf%close()
 
 ## Permissive syntax
 
-We make the ncf%open(..., status=...) like Fortran open()
+We make the ncf%open(..., action=...) like Fortran open()
 
-* overwrite (truncate) existing file: open with `status='new'` or `status='replace'`
-* append to existing file or create file: `status='old'` or `status='unknown'`
+* overwrite (truncate) existing file: open with `action='w'`
+* append to existing file or create file: `action='rw'`
 
 ## Notes
 

VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

src/interface.f90

@@ -27,7 +27,6 @@ module nc4fortran
 logical :: verbose = .false.
 logical :: debug = .false.
 logical :: is_open = .false.
-logical :: is_scratch = .false.
 !! will be auto-deleted on close
 character(80) :: libversion
 
@@ -470,12 +469,12 @@ subroutine nc_initialize(self,filename,ierr, status,action,comp_lvl,verbose,debu
 class(netcdf_file), intent(inout) :: self
 character(*), intent(in) :: filename
 integer, intent(out), optional :: ierr
-character(*), intent(in), optional :: status
+character(*), intent(in), optional :: status !< DEPRECATED
 character(*), intent(in), optional :: action
 integer, intent(in), optional :: comp_lvl
 logical, intent(in), optional :: verbose, debug
 
-character(:), allocatable :: lstatus, laction
+character(:), allocatable :: laction
 integer :: ier
 
 if (self%is_open) then
@@ -492,50 +491,37 @@ subroutine nc_initialize(self,filename,ierr, status,action,comp_lvl,verbose,debu
 !> get library version
 self%libversion = nf90_inq_libvers()
 
-lstatus = 'unknown'
-if(present(status)) lstatus = status
+if(present(status)) write(stderr,*) 'nc4fortran:WARNING: status is deprecated. use action instead.'
 
 laction = 'rw'
 if(present(action)) laction = action
 
-select case(lstatus)
-case ('old', 'unknown')
-  select case(laction)
-    case('read','r')
-      ier = nf90_open(self%filename, NF90_NOWRITE, self%ncid)
-    case('r+')
-      ier = nf90_open(self%filename, NF90_NETCDF4, self%ncid)
-    case('readwrite', 'rw', 'append', 'a')
-      if(is_netcdf(filename)) then
-        !! NF90_WRITE is necessary to be in true read/write mode
-        ier = nf90_open(self%filename, ior(NF90_WRITE, NF90_NETCDF4), self%ncid)
-      else
-        ier = nf90_create(self%filename, ior(NF90_CLOBBER, NF90_NETCDF4), self%ncid)
-      endif
-    case('w','write')
-      ier = nf90_create(self%filename, ior(NF90_CLOBBER, NF90_NETCDF4), self%ncid)
-    case default
-      write(stderr,*) 'Unsupported action -> ' // laction
-      error stop 128
-    end select
-case('new','replace')
-  ier = nf90_create(self%filename, ior(NF90_CLOBBER, NF90_NETCDF4), self%ncid)
-case('scratch')
+select case(laction)
+case('read','r')
+  ier = nf90_open(self%filename, NF90_NOWRITE, self%ncid)
+case('r+')
+  ier = nf90_open(self%filename, NF90_NETCDF4, self%ncid)
+case('readwrite', 'rw', 'append', 'a')
+  if(is_netcdf(filename)) then
+    !! NF90_WRITE is necessary to be in true read/write mode
+    ier = nf90_open(self%filename, ior(NF90_WRITE, NF90_NETCDF4), self%ncid)
+  else
     ier = nf90_create(self%filename, ior(NF90_CLOBBER, NF90_NETCDF4), self%ncid)
-  self%is_scratch = .true.
-  if(.not.is_absolute_path(filename)) self%filename = get_tempdir() // '/' // filename
+  endif
+case('w','write')
+  ier = nf90_create(self%filename, ior(NF90_CLOBBER, NF90_NETCDF4), self%ncid)
 case default
-  write(stderr,*) 'Unsupported status -> '// lstatus
-  error stop 128
+  error stop 'nc4fortran: Unsupported action -> ' // laction
 end select
 
+
 if (present(ierr)) ierr = ier
 if (ier == NF90_NOERR) then
   self%is_open = .true.
   return
 endif
 
-write(stderr,*) 'ERROR:initialize ' // filename // ' could not be created'
+write(stderr,*) 'nc4fortran:ERROR: initialize ' // filename // ' could not be created'
 if (present(ierr)) return
 error stop
 
@@ -573,10 +559,6 @@ subroutine nc_finalize(self, ierr)
   error stop
 endif
 
-if(self%is_scratch) then
-  if (std_unlink(self%filename)) write(stderr,*) 'WARNING: could not delete scratch file: ' // self%filename
-endif
-
 self%is_open = .false.
 
 end subroutine nc_finalize

src/read.f90

@@ -82,7 +82,7 @@
 
 type(netcdf_file) :: h
 
-call h%open(filename, status='old', action='r')
+call h%open(filename, action='r')
 nc_exist = h%exist(dname)
 call h%close()
 

src/tests/test_array.f90

@@ -41,7 +41,7 @@ subroutine test_basic_array()
 r1 = i1
 r2 = i2
 
-call h%open(filename, status='replace', comp_lvl=1)
+call h%open(filename, action='w', comp_lvl=1)
 
 call h%write('int32-1d', i1)
 call h%write('int32-2d', i2, ['x', 'y'])
@@ -60,7 +60,7 @@ subroutine test_basic_array()
 call h%close()
 
 !! read
-call h%open(filename, status='old', action='r')
+call h%open(filename, action='r')
 
 !> int32
 call h%read('int32-1d', i1t)

src/tests/test_attributes.f90

@@ -20,7 +20,7 @@ subroutine test_write_attributes(path)
 type(netcdf_file) :: h
 character(*), intent(in) :: path
 
-call h%open(path, status='replace')
+call h%open(path, action='w')
 
 call h%write('x', 1)
 
@@ -46,7 +46,7 @@ subroutine test_read_attributes(path)
 
 integer :: x
 
-call h%open(path, status='old', action='r')
+call h%open(path, action='r')
 
 call h%read('x', x)
 if (x/=1) error stop 'read_attribute: unexpected value'