Faster bound #173
Faster bound #173
Conversation
Conflicts: examples/storm-surge/ike/setplot.py
Merge branch 'master' of git://github.com/clawpack/geoclaw Conflicts: examples/storm-surge/ike/setplot.py
|
The problem is that this was branched off of I tried merging The unit tests then pass on my computer, but won't on travis because this PR depends on clawpack/amrclaw#149, so that should be fixed and merged in first perhaps, or better yet before doing that merge, do a PR on clawpack/clawpack first that includes both these PRs so they get tested together before merging either. See http://www.clawpack.org/developers.html#top-level-pull-requests |
| @@ -161,10 +162,10 @@ def gulf_after_axes(cd): | |||
| plotaxes.ylimits = gulf_ylimits | |||
| plotaxes.afteraxes = gulf_after_axes | |||
|
|
|||
| surge.add_surface_elevation(plotaxes, plot_type='contourf', | |||
| surge.plot.add_surface_elevation(plotaxes, plot_type='contourf', | |||
There was a problem hiding this comment.
This line is wrong -- should be surgeplot.add_surface_elevation(...
@mandli: not sure if this is wrong in other branches.
There was a problem hiding this comment.
At some point there was a PR that replaced these updates and I have not had a chance to go back through and sync everything up. Let me know if you find any other issues with the data objects as I imagine there are more.
* master: (36 commits) bug fixes in maketopo.py of geoclaw/examples/tsunami/chile2010 add a docstring, not sure if nosetests is running this test. added test_etopo.py and sample script fetch_etopo.py New etopotools.py module for downloading etopo1 data added fgmax_frompatch_arrival_velocity.f90, which can be used instead of the default fgmax_frompatch.f90 to flag arrival times based on amplitude of velocity rather than on surface elevation. Works better particularly in regions of subsidence add abs() to test for equality, and fix more places where delta should be a tuple fixed comments about cellsize fix delta to tuple in topotools write and plot functions topo_type is not second argument, so need to specify name added maketopo.py to make bowl.nc in tests/netcdf_topo Revert to default compiler flags Adapt topotools.Topography.plot to new add_colorbar change max to min in topotools Add None and False support to parameter options Change from rinfinity to huge intrinsic Add and modify surge data parameters missing .max() operator in computing deltas Minor tweak for failed tests Fix travis failure script Fix compilation bug in NetCDF test" ...
* origin/master: skiprows replaced by skip_header in call to genfromtxt in dtopotools.py due to numpy changes Set omp private variable time in gfixup.f
FasterBound updated to incorporate 5.3.1 changes to master
as the name says, and is sometimes substantially faster for large numbers of grids. Has to go with matching amrclaw fasterBound branch. Also has lots of other tiny fixes, mostly format statement enlargements, to also go with larger numbers of grids