Skip to content

Commit

Permalink
tools/fv_io: add missing else statement and ensures all _is_open vari…
Browse files Browse the repository at this point in the history
…ables to .false. when files are closed (#284)
  • Loading branch information
laurenchilutti authored Sep 22, 2023
1 parent c6edc12 commit 6b68092
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions tools/fv_io.F90
Original file line number Diff line number Diff line change
Expand Up @@ -729,8 +729,9 @@ subroutine remap_restart(Atm)
call read_restart(Atm(1)%Rsf_restart, ignore_checksum=Atm(1)%flagstruct%ignore_rst_cksum)
call close_file(Atm(1)%Rsf_restart)
Atm(1)%Rsf_restart_is_open = .false.
call mpp_error(NOTE,'==> Warning from remap_restart: Expected file '//trim(fname)//' does not exist')
Atm%flagstruct%srf_init = .false.
else
call mpp_error(NOTE,'==> Warning from remap_restart: Expected file '//trim(fname)//' does not exist')
Atm%flagstruct%srf_init = .false.
endif

if ( Atm(1)%flagstruct%fv_land ) then
Expand All @@ -740,6 +741,7 @@ subroutine remap_restart(Atm)
if (Atm(1)%Mg_restart_is_open) then
call read_data(Atm(1)%Mg_restart, 'ghprime', Atm(1)%sgh)
call close_file(Atm(1)%Mg_restart)
Atm(1)%Mg_restart_is_open = .false.
else
call mpp_error(NOTE,'==> Warning from remap_restart: Expected file '//trim(fname)//' does not exist')
endif
Expand All @@ -749,6 +751,7 @@ subroutine remap_restart(Atm)
if (Atm(1)%Lnd_restart_is_open) then
call read_data(Atm(1)%Lnd_restart, 'oro', Atm(1)%oro)
call close_file(Atm(1)%Lnd_restart)
Atm(1)%Lnd_restart_is_open = .false.
else
call mpp_error(NOTE,'==> Warning from remap_restart: Expected file '//trim(fname)//' does not exist')
endif
Expand Down Expand Up @@ -1463,11 +1466,13 @@ subroutine fv_io_write_BCs(Atm, timestamp)
if (Atm%neststruct%BCfile_sw_is_open) then
call write_restart_bc(Atm%neststruct%BCfile_sw)
call close_file(Atm%neststruct%BCfile_sw)
Atm%neststruct%BCfile_sw_is_open = .false.
endif

if (Atm%neststruct%BCfile_ne_is_open) then
call write_restart_bc(Atm%neststruct%BCfile_ne)
call close_file(Atm%neststruct%BCfile_ne)
Atm%neststruct%BCfile_ne_is_open = .false.
endif

deallocate(all_pelist)
Expand Down Expand Up @@ -1497,11 +1502,13 @@ subroutine fv_io_read_BCs(Atm)
if (Atm%neststruct%BCfile_sw_is_open) then
call read_restart_bc(Atm%neststruct%BCfile_sw, ignore_checksum=Atm%flagstruct%ignore_rst_cksum)
call close_file(Atm%neststruct%BCfile_sw)
Atm%neststruct%BCfile_sw_is_open = .false.
endif

if (Atm%neststruct%BCfile_ne_is_open) then
call read_restart_bc(Atm%neststruct%BCfile_ne, ignore_checksum=Atm%flagstruct%ignore_rst_cksum)
call close_file(Atm%neststruct%BCfile_ne)
Atm%neststruct%BCfile_ne_is_open = .false.
endif


Expand Down

0 comments on commit 6b68092

Please sign in to comment.