Skip to content

fix logic errors #138

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

Merged
bensonr merged 2 commits into from
Oct 7, 2021
Merged

fix logic errors #138

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86b2176
fix logic errors
menzel-r Sep 9, 2021
fc8245a
Merge tag '2021.03.01' into fix-nudge-logic
menzel-r Sep 9, 2021
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
26 changes: 19 additions & 7 deletions GFDL_tools/read_climate_nudge_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ module read_climate_nudge_data_mod
get_dimension_names, get_dimension_size, FmsNetcdfFile_t, &
get_num_variables, get_variable_names, get_variable_size, &
get_variable_num_dimensions, get_variable_units, &
get_time_calendar, read_data, variable_att_exists
get_time_calendar, read_data, variable_att_exists, &
is_dimension_unlimited
use mpp_mod, only: input_nml_file, mpp_npes, mpp_get_current_pelist
use constants_mod, only: PI, GRAV, RDGAS, RVGAS

Expand Down Expand Up @@ -107,6 +108,7 @@ subroutine read_climate_nudge_data_init (nlon, nlat, nlev, ntime)
character(len=32), allocatable :: fields(:)
type(FmsNetcdfFile_t) :: fileobj
integer, allocatable, dimension(:) :: pes !< Array of ther pes in the current pelist
character(len=128), dimension(:), allocatable :: names

if (module_is_initialized) return
! initial file names to blanks
Expand Down Expand Up @@ -147,22 +149,32 @@ subroutine read_climate_nudge_data_init (nlon, nlat, nlev, ntime)
if (open_file(fileobj, trim(filenames(n)), "read", pelist=pes)) then
Files(n)%ndim=get_num_dimensions(fileobj)

allocate (Files(n)%length_axes(Files(n)%ndim))
allocate(files(n)%length_axes(Files(n)%ndim))
allocate(names(files(n)%ndim))
call get_dimension_names(fileobj, names)
files(n)%axes(:) = ""

! inquire dimension sizes
do i = 1, Files(n)%ndim
call get_dimension_names(fileobj, Files(n)%axes)
do j = 1, NUM_REQ_AXES
if (trim(Files(n)%axes(j)) .eq. trim(required_axis_names(j))) then
if (trim(names(i)) .eq. trim(required_axis_names(j))) then
files(n)%axes(j) = trim(names(i))
call get_dimension_size(fileobj, Files(n)%axes(j), Files(n)%length_axes(j))
call check_axis_size (j,Files(n)%length_axes(j))
Files(n)%axis_index(j) = i
exit
endif
enddo
if (j .gt. num_req_axes) then
if (is_dimension_unlimited(fileobj, trim(names(i)))) then
! time axis indexing
files(n)%axes(index_time) = trim(names(i))
call get_dimension_size(fileobj, files(n)%axes(index_time), &
files(n)%length_axes(index_time))
endif
endif
enddo
! time axis indexing
call get_dimension_size(fileobj, Files(n)%axes(INDEX_TIME), Files(n)%length_axes(INDEX_TIME))
deallocate(names)
Files(n)%ntim = Files(n)%length_axes(INDEX_TIME)
Files(n)%time_offset = numtime
numtime = numtime + Files(n)%ntim
Expand All @@ -173,7 +185,7 @@ subroutine read_climate_nudge_data_init (nlon, nlat, nlev, ntime)
Files(n)%field_index = 0
do i = 1, Files(n)%nvar
nd = get_variable_num_dimensions(fileobj, fields(i))
call get_variable_size(fileobj, fields(i), siz)
call get_variable_size(fileobj, fields(i), siz(1:nd))
do j = 1, NUM_REQ_FLDS
if (trim(fields(i)) .eq. trim(required_field_names(j))) then
Files(n)%field_index(j) = i
Expand Down