Skip to content

(*)Correct multi-name handling by save_restart #1426

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
marshallward merged 2 commits into from
Jun 21, 2021
Merged

(*)Correct multi-name handling by save_restart #1426

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee2e484
(*)Correct multi-name handling by save_restart
Hallberg-NOAA Jun 15, 2021
5df2ed4
Merge branch 'dev/gfdl' into fix_restart_names
marshallward Jun 21, 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
18 changes: 14 additions & 4 deletions src/framework/MOM_restart.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,13 +847,14 @@ subroutine save_restart(directory, time, G, CS, time_stamped, filename, GV, num_
integer :: start_var, next_var ! The starting variables of the
! current and next files.
type(file_type) :: IO_handle ! The I/O handle of the open fileset
integer :: m, nz, num_files
integer :: m, nz
integer :: num_files ! The number of restart files that will be used.
integer :: seconds, days, year, month, hour, minute
character(len=8) :: hor_grid, z_grid, t_grid ! Variable grid info.
character(len=64) :: var_name ! A variable's name.
real :: restart_time
character(len=32) :: filename_appendix = '' ! Appendix to filename for ensemble runs
integer :: length
integer :: length ! The length of a text string.
integer(kind=8) :: check_val(CS%max_fields,1)
integer :: isL, ieL, jsL, jeL, pos
integer :: turns
Expand Down Expand Up @@ -923,15 +924,24 @@ subroutine save_restart(directory, time, G, CS, time_stamped, filename, GV, num_
endif
endif

restartpath = trim(directory)// trim(restartname)
restartpath = trim(directory) // trim(restartname)

if (num_files < 10) then
write(suffix,'("_",I1)') num_files
else
write(suffix,'("_",I2)') num_files
endif

if (num_files > 0) restartpath = trim(restartpath) // trim(suffix)
length = len_trim(restartpath)
if (length < 3) then ! This case is very uncommon but this test avoids segmentation-faults.
if (num_files > 0) restartpath = trim(restartpath) // suffix
restartpath = trim(restartpath)//".nc"
elseif (restartpath(length-2:length) == ".nc") then
if (num_files > 0) restartpath = restartpath(1:length-3)//trim(suffix)//".nc"
else
if (num_files > 0) restartpath = trim(restartpath) // suffix
restartpath = trim(restartpath)//".nc"
endif

do m=start_var,next_var-1
vars(m-start_var+1) = CS%restart_field(m)%vars
Expand Down