Skip to content

Commit

Permalink
Merge pull request #133 from rjleveque/v5.5.0rc-alpha
Browse files Browse the repository at this point in the history
v5.5.0rc-alpha release candidate
  • Loading branch information
rjleveque committed Aug 25, 2018
2 parents f297086 + afd5a92 commit ca0ce43
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion geoclaw
Submodule geoclaw updated 92 files
+2 −47 examples/multi-layer/bowl-radial/Makefile
+2 −1 examples/multi-layer/bowl-radial/setrun.py
+1 −43 examples/multi-layer/plane_wave/Makefile
+1 −0 examples/multi-layer/plane_wave/setplot.py
+7 −11 examples/multi-layer/plane_wave/setrun.py
+1 −1 examples/storm-surge/ike/.gitignore
+0 −15 examples/storm-surge/ike/Makefile
+6 −1 examples/storm-surge/ike/README.rst
+0 −21 examples/storm-surge/ike/get_bathy.py
+1 −1 examples/storm-surge/ike/old_ike.storm
+6 −22 examples/storm-surge/ike/setplot.py
+44 −28 examples/storm-surge/ike/setrun.py
+68 −0 examples/storm-surge/isaac/Makefile
+13 −0 examples/storm-surge/isaac/README.rst
+47 −0 examples/storm-surge/isaac/old_isaac.strom
+130 −0 examples/storm-surge/isaac/plot_num_grids.py
+228 −0 examples/storm-surge/isaac/setplot.py
+358 −0 examples/storm-surge/isaac/setplot_kml.py
+472 −0 examples/storm-surge/isaac/setrun.py
+13 −2 examples/tsunami/chile2010/README.rst
+1 −0 examples/tsunami/chile2010/setplot.py
+2 −0 examples/tsunami/chile2010/setplot_kml.py
+4 −1 examples/tsunami/chile2010/setrun.py
+4 −5 src/2d/shallow/Makefile.geoclaw
+55 −85 src/2d/shallow/amr2.f90
+0 −311 src/2d/shallow/bc2amr.f
+309 −0 src/2d/shallow/bc2amr.f90
+3 −3 src/2d/shallow/flag2refine2.f90
+3 −2 src/2d/shallow/friction_module.f90
+183 −0 src/2d/shallow/multilayer/Makefile.multilayer
+1 −1 src/2d/shallow/multilayer/filval.f90
+3 −3 src/2d/shallow/multilayer/flag2refine2.f90
+2 −8 src/2d/shallow/multilayer/multilayer_module.f90
+35 −15 src/2d/shallow/multilayer/setaux.f90
+96 −85 src/2d/shallow/multilayer/src2.f90
+0 −327 src/2d/shallow/multilayer/valout.f
+481 −0 src/2d/shallow/multilayer/valout.f90
+0 −1 src/2d/shallow/setaux.f90
+0 −195 src/2d/shallow/surge/constant_storm_module.f90
+119 −0 src/2d/shallow/surge/data_storm_module.f90
+184 −257 src/2d/shallow/surge/model_storm_module.f90
+0 −115 src/2d/shallow/surge/stommel_storm_module.f90
+125 −97 src/2d/shallow/surge/storm_module.f90
+2 −1 src/2d/shallow/tick.f
+0 −301 src/2d/shallow/valout.f
+456 −0 src/2d/shallow/valout.f90
+102 −100 src/python/geoclaw/data.py
+53 −108 src/python/geoclaw/dtopotools.py
+47 −36 src/python/geoclaw/kmltools.py
+0 −1 src/python/geoclaw/surge/plot.py
+1,189 −0 src/python/geoclaw/surge/storm.py
+159 −0 src/python/geoclaw/units.py
+158 −0 tests/data/storm/atcf.txt
+56 −0 tests/data/storm/atcf_geoclaw.txt
+7 −0 tests/data/storm/hurdat.txt
+9 −0 tests/data/storm/hurdat_geoclaw.txt
+ tests/data/storm/ibtracs.nc
+59 −0 tests/data/storm/ibtracs_geoclaw.txt
+7 −0 tests/data/storm/jma.txt
+9 −0 tests/data/storm/jma_geoclaw.txt
+17 −0 tests/data/storm/tcvitals.txt
+19 −0 tests/data/storm/tcvitals_geoclaw.txt
+1 −43 tests/multilayer/Makefile
+154 −157 tests/multilayer/qinit_module.f90
+4,747 −0 tests/multilayer/regression_data/claw_git_diffs.txt
+51 −26 tests/multilayer/regression_data/claw_git_status.txt
+104 −104 tests/multilayer/regression_data/gauge00000.txt
+103 −103 tests/multilayer/regression_data/gauge00001.txt
+102 −102 tests/multilayer/regression_data/gauge00002.txt
+102 −102 tests/multilayer/regression_data/gauge00003.txt
+103 −103 tests/multilayer/regression_data/gauge00004.txt
+11 −12 tests/multilayer/regression_tests.py
+191 −234 tests/multilayer/setplot.py
+9 −10 tests/multilayer/setrun.py
+0 −102 tests/multilayer_amr/Makefile
+0 −0 tests/multilayer_amr/__init__.py
+0 −52 tests/multilayer_amr/qinit.f90
+0 −313 tests/multilayer_amr/qinit_module.f90
+0 −96 tests/multilayer_amr/regression_data/claw_git_status.txt
+0 −107 tests/multilayer_amr/regression_data/gauge00000.txt
+0 −107 tests/multilayer_amr/regression_data/gauge00001.txt
+0 −107 tests/multilayer_amr/regression_data/gauge00002.txt
+0 −107 tests/multilayer_amr/regression_data/gauge00003.txt
+0 −107 tests/multilayer_amr/regression_data/gauge00004.txt
+0 −85 tests/multilayer_amr/regression_tests.py
+0 −571 tests/multilayer_amr/setplot.py
+0 −533 tests/multilayer_amr/setrun.py
+1 −1 tests/netcdf_topo/Makefile
+4 −1 tests/test_etopo1.py
+154 −0 tests/test_storm.py
+29 −0 tests/test_units.py
+0 −155 tests/topo_test.py
2 changes: 1 addition & 1 deletion visclaw

0 comments on commit ca0ce43

Please sign in to comment.