Merged fix proper nesting changes and fix timers #225
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* master: (69 commits) arcgis/qgis does not read header properly with xlower,ylower - needs keywords xllcorner,yllcorner added line2kml, poly2kml and improved several other tools Turn on landfal time display for test Remove old format statements Minor multilayer makefile fixes Add relative landfall time output Update data locations Fix level field width Add set_storm to initialization routines waves and s declared with wrong dimensions in qad - not used in qad but passed in to rpn2 and could cause problems there changed default Z_format in Topography.write removed unused regression_data file in tests/bowl_slosh cleaned up tests/dtopo1 to eliminate depricated topoNwriter functions and fix maketopo.py to run same problem as regression_tests.py and fix out of date setplot.py modify tests/storm_surge/regression_tests.py to use modified topotools with Z_format need to specify Z_format also in regression_tests.py specify Z_format to create same topo file as previously with new topography.write add parameter coarsen to Topography.crop to allow coarsening of a grid by sampling every points, defaults to 1. Also allow filter_region=None to use entire region when coarsening. modify examples/tsunami/bowl*/maketopo.py to explicitly use Topography rather than e.g. topo2writer, which should be deprecated, and changed output format for backward compatibility modify Topography.write method to 1) have topo_type as second argument, same as read, rather than third, and 2) write with format 9.3f by default for smaller files, with new parameter Z_format to change. Also modified test problems for backward compatibility give etopo file_name extension asc rather than tt3 since header is in asc form. ...
…ProperNesting * mjberger/fixTimers: fixed timers: deleted some, modified some. GOES WITH AMRCLAW fixTimers branch
…ProperNesting * mjberger/fixTimers: removed unused variable had left some setauxTimers in - removed them
This was referenced Sep 24, 2016
|
You may need to do a super-repository commit to get this all to pass the tests. |
rjleveque
added a commit
to rjleveque/clawpack
that referenced
this pull request
Sep 24, 2016
|
Oops put comment in wrong PR so removing. |
rjleveque
added a commit
to clawpack/clawpack
that referenced
this pull request
Sep 24, 2016
to test clawpack/geoclaw#225, which requires updates to amrclaw
|
We did merge in a different way to store gauge files (clawpack/clawutil#102), maybe that has something to do with it? |
|
Not sure where this stands now, can we merge it in? |
|
Randy was working on this friday - the two are somehow out of sync. — Marsha On Sep 27, 2016, at 5:09 PM, Kyle Mandli [email protected] wrote:
|
|
This is out of sync? |
|
They are out of sync only because amrclaw has had things merged but not yet geoclaw (this PR). But I updated clawpack/clawpack after amrclaw and the Travis tests are now passing on this PR so I think it can be merged in. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Combination of mjberger/fixProperNesting and mjberger/fixTimers, with merges from recent changes to master.
Travis tests might not pass until clawpack/amrclaw#174 is merged and clawpack/clawpack updated.
Replaces #223.