allow topo override_order with dtopo files#690
Conversation
|
Looks like this may be a way to go. Does the output in all the examples stay the same? We should really probably come up with a test/example that flexes the As an aside, it looks like the white space was all deleted. Need to remove that from the source generally, but makes it look like a lot more has changed. |
|
@mandli: I haven't done a careful test, but none of our examples had multiple topo or dtopo files with nearly equal resolution and so I don't think this will change anything. Sorry about the white space, I agree at some point when things are stable we should purge it all and then try to keep it that way. |
|
I removed the white space changes so this PR is now cleaner, in case it has bugs. We can fix the white space later. |
|
I think this is working well enough to merge, and I'll put a note in the release notes and in the documentation https://www.clawpack.org/topo_order.html to note that there is now a fudge factor included for files that are nearly equal resolution. |
I implemented the strategy suggested in #689 -- first rank ordering the original topo files and then inserting the
topo_for_dtopofiles in this list.I've tested it with random collections of topo and dtopo files and I think the ordering is working as intended.
I also improved what is written out to the file
_output/fort.geoto report on the ordering actually being used in the run. For example, a case with 5 topo files and 3 dtopo files (filenumbers # 6,7,8) gives this output when run withrundata.topo_data.override_order = False:and the following output when run with
rundata.topo_data.override_order = True: