Skip to content

Fix size() for large variables >= 2^31 values #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dave-Allured wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix size() for large variables >= 2^31 values #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions fortran/netcdf4_eightbyte.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ function nf90_get_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
if (nf90_get_var_1D_EightByteInt .eq. nf90_noerr) then
if (format_num .eq. nf90_format_netcdf4 .OR. &
format_num .eq. nf90_format_cdf5) then
allocate(defaultInt8Array(size(values)))
allocate(defaultInt8Array(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_1D_EightByteInt = &
Expand All @@ -411,7 +411,7 @@ function nf90_get_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
values(:) = reshape(defaultInt8Array(:), shapeValues)
if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
else
allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_1D_EightByteInt = &
Expand Down Expand Up @@ -458,7 +458,7 @@ function nf90_get_var_2D_EightByteInt(ncid, varid, values, start, count, stride,
if (nf90_get_var_2D_EightByteInt .eq. nf90_noerr) then
if (format_num .eq. nf90_format_netcdf4 .OR. &
format_num .eq. nf90_format_cdf5) then
allocate(defaultInt8Array(size(values)))
allocate(defaultInt8Array(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_2D_EightByteInt = &
Expand All @@ -473,7 +473,7 @@ function nf90_get_var_2D_EightByteInt(ncid, varid, values, start, count, stride,
values(:, :) = reshape(defaultInt8Array(:), shapeValues)
if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
else
allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_2D_EightByteInt = &
Expand Down Expand Up @@ -520,7 +520,7 @@ function nf90_get_var_3D_EightByteInt(ncid, varid, values, start, count, stride,
if (nf90_get_var_3D_EightByteInt .eq. nf90_noerr) then
if (format_num .eq. nf90_format_netcdf4 .OR. &
format_num .eq. nf90_format_cdf5) then
allocate(defaultInt8Array(size(values)))
allocate(defaultInt8Array(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_3D_EightByteInt = &
Expand All @@ -535,7 +535,7 @@ function nf90_get_var_3D_EightByteInt(ncid, varid, values, start, count, stride,
values(:, :, :) = reshape(defaultInt8Array(:), shapeValues)
if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
else
allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_3D_EightByteInt = &
Expand Down Expand Up @@ -582,7 +582,7 @@ function nf90_get_var_4D_EightByteInt(ncid, varid, values, start, count, stride,
if (nf90_get_var_4D_EightByteInt .eq. nf90_noerr) then
if (format_num .eq. nf90_format_netcdf4 .OR. &
format_num .eq. nf90_format_cdf5) then
allocate(defaultInt8Array(size(values)))
allocate(defaultInt8Array(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_4D_EightByteInt = &
Expand All @@ -597,7 +597,7 @@ function nf90_get_var_4D_EightByteInt(ncid, varid, values, start, count, stride,
values(:, :, :, :) = reshape(defaultInt8Array(:), shapeValues)
if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
else
allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_4D_EightByteInt = &
Expand Down Expand Up @@ -644,7 +644,7 @@ function nf90_get_var_5D_EightByteInt(ncid, varid, values, start, count, stride,
if (nf90_get_var_5D_EightByteInt .eq. nf90_noerr) then
if (format_num .eq. nf90_format_netcdf4 .OR. &
format_num .eq. nf90_format_cdf5) then
allocate(defaultInt8Array(size(values)))
allocate(defaultInt8Array(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_5D_EightByteInt = &
Expand All @@ -659,7 +659,7 @@ function nf90_get_var_5D_EightByteInt(ncid, varid, values, start, count, stride,
values(:, :, :, :, :) = reshape(defaultInt8Array(:), shapeValues)
if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
else
allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_5D_EightByteInt = &
Expand Down Expand Up @@ -706,7 +706,7 @@ function nf90_get_var_6D_EightByteInt(ncid, varid, values, start, count, stride,
if (nf90_get_var_6D_EightByteInt .eq. nf90_noerr) then
if (format_num .eq. nf90_format_netcdf4 .OR. &
format_num .eq. nf90_format_cdf5) then
allocate(defaultInt8Array(size(values)))
allocate(defaultInt8Array(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_6D_EightByteInt = &
Expand All @@ -721,7 +721,7 @@ function nf90_get_var_6D_EightByteInt(ncid, varid, values, start, count, stride,
values(:, :, :, :, :, :) = reshape(defaultInt8Array(:), shapeValues)
if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
else
allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_6D_EightByteInt = &
Expand Down Expand Up @@ -768,7 +768,7 @@ function nf90_get_var_7D_EightByteInt(ncid, varid, values, start, count, stride,
if (nf90_get_var_7D_EightByteInt .eq. nf90_noerr) then
if (format_num .eq. nf90_format_netcdf4 .OR. &
format_num .eq. nf90_format_cdf5) then
allocate(defaultInt8Array(size(values)))
allocate(defaultInt8Array(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_7D_EightByteInt = &
Expand All @@ -783,7 +783,7 @@ function nf90_get_var_7D_EightByteInt(ncid, varid, values, start, count, stride,
values(:, :, :, :, :, :, :) = reshape(defaultInt8Array(:), shapeValues)
if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
else
allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))
if(present(map)) then
localMap (:size(map)) = map(:)
nf90_get_var_7D_EightByteInt = &
Expand Down
14 changes: 7 additions & 7 deletions fortran/netcdf_eightbyte.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ function nf90_get_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(1)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -295,7 +295,7 @@ function nf90_get_var_2D_EightByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(2)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -336,7 +336,7 @@ function nf90_get_var_3D_EightByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(3)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -377,7 +377,7 @@ function nf90_get_var_4D_EightByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(4)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -418,7 +418,7 @@ function nf90_get_var_5D_EightByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(5)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -459,7 +459,7 @@ function nf90_get_var_6D_EightByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(6)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -500,7 +500,7 @@ function nf90_get_var_7D_EightByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(7)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down
14 changes: 7 additions & 7 deletions fortran/netcdf_expanded.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@ function nf90_get_var_1D_FourByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(1)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -1929,7 +1929,7 @@ function nf90_get_var_2D_FourByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(2)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -1970,7 +1970,7 @@ function nf90_get_var_3D_FourByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(3)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -2011,7 +2011,7 @@ function nf90_get_var_4D_FourByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(4)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -2052,7 +2052,7 @@ function nf90_get_var_5D_FourByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(5)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -2093,7 +2093,7 @@ function nf90_get_var_6D_FourByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(6)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down Expand Up @@ -2134,7 +2134,7 @@ function nf90_get_var_7D_FourByteInt(ncid, varid, values, start, count, stride,
integer :: numDims, counter, shapeValues(7)
integer, dimension(:), allocatable :: defaultIntArray

allocate(defaultIntArray(size(values)))
allocate(defaultIntArray(size(values,kind=EightByteInt)))

! Set local arguments to default values
shapeValues = shape(values)
Expand Down