Cleanup restartvar_{DIMS}d_{TYPE} to ONLY be valid for a 1d interface as we already have a restart_2d_{TYPE}_bounds interface for 2D

[ekluzek]

Erik Kluzek < erik > - 2017-06-05 15:50:59 -0600
Bugzilla Id: 2469
Bugzilla Depends: 2468,
Bugzilla CC: andre, dlawren, mvertens, rfisher, sacks,

restUtilMod.F90.in has two interfaces for restartvars, one should really only be used for the 1d interface and the second for the 2d one. The first one is supposed general, but it doesn't do enough checking to be correct for a 2d case. The only valid options are 1d and 2d anyway, so generalizing the first to work for both isn't worth it. So the data array should be data(:) and dim2name removed from the first interface and changed to restartvar_1d_{TYPE}. Note, the other thing that distinguishes the two is the optional arguments: lowerb2, and upperb2 are possible for the 2d case, but not the 1d one. And in the 1d case, dim1name is NOT a required argument like it is in the 2d one (along with dim2name).

Bug 2468 came to be because of this problem since switchdim is really required when dimname2name is set.

[ekluzek]

Erik Kluzek < erik > - 2017-06-05 15:56:45 -0600

You could also save duplication between the two methods, by having a private subroutine call that both interfaces would call for the part that's identical between both. The main guts of the two are completely duplicated. It would make the two interfaces clearer if the bulk of the differences between the two just had to do with the 1d versus 2d difference. And that could be accomplished by a private subroutine that both call.

[ekluzek]

Looks like this is still an issue.