Skip to content
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

Refactor of get_field_nc index fixes #8

Merged
merged 1 commit into from
Mar 13, 2023
Merged

Refactor of get_field_nc index fixes #8

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
42 changes: 24 additions & 18 deletions src/framework/MOM_io_file.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module MOM_io_file
use MOM_netcdf, only : get_netcdf_fields
use MOM_netcdf, only : read_netcdf_field

use MOM_error_handler, only : MOM_error, FATAL, WARNING
use MOM_error_handler, only : MOM_error, FATAL
use MOM_error_handler, only : is_root_PE

implicit none ; private
Expand Down Expand Up @@ -1698,15 +1698,15 @@ subroutine get_field_nc(handle, label, values, rescale)
type(netcdf_field) :: field_nc
! netCDF field associated with label
integer :: isc, iec, jsc, jec
! Index bounds of compute domain using the indexing convention in handle
! Index bounds of compute domain
integer :: isd, ied, jsd, jed
! Index bounds of data domain using the indexing convention in handle
! Index bounds of data domain
integer :: iscl, iecl, jscl, jecl
! Index bounds of compute domain taking into account that array indices here start at 1.
! Local 1-based index bounds of compute domain
integer :: bounds(2,2)
! Index bounds of domain
real, allocatable :: values_nc(:,:)
! Local copy of field, used for data-decomposed I/O
real, allocatable :: values_c(:,:)
! Field values on the compute domain, used for copying to a data domain

isc = handle%HI%isc
iec = handle%HI%iec
Expand All @@ -1729,35 +1729,41 @@ subroutine get_field_nc(handle, label, values, rescale)

field_nc = handle%fields%get(label)

values(:,:) = 0.0
if (data_domain) then
allocate(values_nc(isc:iec,jsc:jec), source=0.)
iscl = isc+1-isd ; iecl = iec+1-isd ; jscl = jsc+1-jsd ; jecl = jec+1-jsd
else
iscl = 1 ; iecl = iec+1-isc ; jscl = 1 ; jecl = jec+1-jsc
endif
if (data_domain) &
allocate(values_c(1:iec-isc+1,1:jec-jsc+1))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because values is intent(out), won't removing the values(:,:) = 0.0 statement that was here before any of these changes lead to uninitialized values (and perhaps NaNs) appearing it its halo regions when data_domain is true, even if the incoming argument is properly initialized outside of this routine? (In practice this might be fine with some compilers if they treat intent(out) like intent(inout).) If so, even a halo update may not be able to eliminate these uninitialized variables.

Were values intent(inout), I would agree that removing its initialization statement should be benign, if possibly outside of the scope of what is strictly necessary in this bug-fix PR.


if (handle%domain_decomposed) then
bounds(1,:) = [isc, jsc] + [handle%HI%idg_offset, handle%HI%jdg_offset]
bounds(2,:) = [iec, jec] + [handle%HI%idg_offset, handle%HI%jdg_offset]
if (data_domain) then
call read_netcdf_field(handle%handle_nc, field_nc, values_nc, bounds=bounds)
call read_netcdf_field(handle%handle_nc, field_nc, values_c, bounds=bounds)
else
call read_netcdf_field(handle%handle_nc, field_nc, values, bounds=bounds)
endif
else
if (data_domain) then
call read_netcdf_field(handle%handle_nc, field_nc, values_nc)
call read_netcdf_field(handle%handle_nc, field_nc, values_c)
else
call read_netcdf_field(handle%handle_nc, field_nc, values)
endif
endif

if (data_domain) &
values(iscl:iecl,jscl:jecl) = values_nc(:,:)
if (data_domain) then
iscl = isc - isd + 1
iecl = iec - isd + 1
jscl = jsc - jsd + 1
jecl = jec - jsd + 1

values(iscl:iecl,jscl:jecl) = values_c(:,:)
else
iscl = 1
iecl = iec - isc + 1
jscl = 1
jecl = jec - jsc + 1
endif

! NOTE: It is more efficient to do the rescale in-place while copying
! values_nc(:,:) to values(:,:). But since rescale is only present for
! values_c(:,:) to values(:,:). But since rescale is only present for
! debugging, we can probably disregard this impact on performance.
if (present(rescale)) then
if (rescale /= 1.0) then
Expand Down
4 changes: 3 additions & 1 deletion src/framework/MOM_netcdf.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,10 @@ subroutine get_netcdf_fields(handle, axes, fields)
call check_netcdf_call(rc, 'get_netcdf_fields', &
'File "' // trim(handle%filename) // '"')

allocate(axes(ndims))
! Initialize unlim_index with an unreachable value (outside [1,ndims])
unlim_index = -1

allocate(axes(ndims))
do i = 1, ndims
rc = nf90_inquire_dimension(handle%ncid, dimids(i), name=label, len=len)
call check_netcdf_call(rc, 'get_netcdf_fields', &
Expand Down