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

Jump to bottom

Fix nudge logic #157

Merged
merged 4 commits into from
Oct 18, 2021
Merged

Fix nudge logic #157

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86b2176
fix logic errors
menzel-gfdl Sep 9, 2021
fc8245a
Merge tag '2021.03.01' into fix-nudge-logic
menzel-gfdl Sep 9, 2021
f37dfa2
fix answer changes
menzel-gfdl Oct 8, 2021
7aba0e7
Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/GFDL_atmos_cubed_sphe…
menzel-gfdl Oct 8, 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
12 changes: 5 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 @@ -262,7 +262,7 @@ subroutine read_time ( times, units, calendar )
if( n == 1) then
time_axis = Files(n)%axes(INDEX_TIME)
call get_variable_units(fileobj, time_axis, units)
if( variable_att_exists(fileobj, time_axis, calendar) ) then
if( variable_att_exists(fileobj, time_axis, "calendar") ) then
call get_time_calendar(fileobj, time_axis, calendar)
else
calendar = 'gregorian '
Expand Down Expand Up @@ -445,16 +445,15 @@ subroutine read_climate_nudge_data_2d (itime, field, dat, is, js)
start = 1
if (present(is)) start(1) = is
if (present(js)) start(2) = js
start(3) = atime

nread = 1
nread(1) = size(dat,1)
nread(2) = size(dat,2)

allocate(pes(mpp_npes()))
call mpp_get_current_pelist(pes)
if (open_file(fileobj, trim(filenames(n)), "read", pelist=pes)) then
call read_data(fileobj, Files(n)%fields(this_index), dat, corner=start, edge_lengths=nread)
call read_data(fileobj, Files(n)%fields(this_index), dat, unlim_dim_level=atime, &
corner=start(1:2), edge_lengths=nread(1:2))
call close_file(fileobj)
endif
deallocate(pes)
Expand Down Expand Up @@ -529,17 +528,16 @@ subroutine read_climate_nudge_data_3d (itime, field, dat, is, js)
start = 1
if (present(is)) start(1) = is
if (present(js)) start(2) = js
start(4) = atime

nread = 1
nread(1) = size(dat,1)
nread(2) = size(dat,2)
nread(3) = size(dat,3)

allocate(pes(mpp_npes()))
call mpp_get_current_pelist(pes)
if (open_file(fileobj, trim(filenames(n)), "read", pelist=pes)) then
call read_data(fileobj, Files(n)%fields(this_index), dat, corner=start, edge_lengths=nread)
call read_data(fileobj, Files(n)%fields(this_index), dat, unlim_dim_level=atime, &
corner=start(1:3), edge_lengths=nread(1:3))
call close_file(fileobj)
endif
deallocate(pes)
Expand Down