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

Moving empty and non-existent data table handling inside data_override #933

Merged
merged 6 commits into from
Mar 31, 2022
Merged

Moving empty and non-existent data table handling inside data_override #933

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84e0303
Enabling the processing of an empty or non-existent data_table or dat…
GFDL-Eric Mar 9, 2022
be5b6d4
Fixed line that was over 120 characters.
GFDL-Eric Mar 9, 2022
f76ca56
Enabling the processing of an empty or non-existent data_table or dat…
GFDL-Eric Mar 9, 2022
771d612
Edited parser test since parser no longer expects to fail upon missin…
GFDL-Eric Mar 9, 2022
04d57de
Rolled back tap-driver.sh changes
GFDL-Eric Mar 24, 2022
275d73e
Eliminated compiler dependent check for data_table existence.
GFDL-Eric Mar 29, 2022
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
17 changes: 9 additions & 8 deletions data_override/data_override.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,20 +365,21 @@ subroutine read_table(data_table)
type(data_type) :: data_entry

logical :: ongrid
logical :: table_exists !< Flag indicating existence of data_table
character(len=128) :: region, region_type

integer :: sunit

! Read coupler_table
open(newunit=iunit, file='data_table', action='READ', iostat=io_status)
if(io_status/=0) then
if(io_status==29) then
call mpp_error(NOTE, 'data_override_mod: File data_table does not exist.')
else
call mpp_error(FATAL, 'data_override_mod: Error in opening file data_table.')
endif
endif
inquire(file='data_table', EXIST=table_exists)
thomas-robinson marked this conversation as resolved.
Show resolved Hide resolved
if (.not. table_exists) then
call mpp_error(NOTE, 'data_override_mod: File data_table does not exist.')
table_size = 0
return
end if

open(newunit=iunit, file='data_table', action='READ', iostat=io_status)
if(io_status/=0) call mpp_error(FATAL, 'data_override_mod: Error in opening file data_table.')
thomas-robinson marked this conversation as resolved.
Show resolved Hide resolved

ntable = 0
ntable_lima = 0
Expand Down