Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regression data update for clawpack/riemann#111 #236

Merged
merged 6 commits into from
Dec 29, 2016
Merged

Regression data update for clawpack/riemann#111 #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e29ead0
updated regression data for new Riemann solver from clawpack/riemann#111
rjleveque Dec 21, 2016
824ca39
fix regression data in tests/multilayer and remove claw_git_diffs.txt…
rjleveque Dec 21, 2016
4916459
updated regression data in bowl_slosh for clawpack/riemann#111
rjleveque Dec 21, 2016
799814f
changed relative import to get test to run"
rjleveque Dec 21, 2016
97ad5e3
move import statement to top for Travis?
rjleveque Dec 24, 2016
e65d271
try relative import as suggested by @ketch
rjleveque Dec 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions tests/bowl_slosh/regression_data/claw_git_diffs.txt
View file
Open in desktop

This file was deleted.

28 changes: 16 additions & 12 deletions tests/bowl_slosh/regression_data/claw_git_status.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Clawpack Git Status
Diffs can be found in /Users/rjl/git/clawpack/geoclaw/tests/bowl_slosh/regression_data/claw_git_diffs.txt

Sun, 09 Oct 2016 09:30:38 PDT
Tue, 20 Dec 2016 22:18:41 PST
$CLAW = /Users/rjl/git/clawpack
$FC = gfortran

Expand All @@ -12,10 +12,10 @@ classic
/Users/rjl/git/clawpack/classic

--- last commit ---
31c9723 Merge pull request #74 from rjleveque/regression_claw_git_status
8e6d0c2 make plotdata an optional argument in setplot

--- branch and status ---
## master...origin/master
## setplot_fixes


===========
Expand All @@ -24,10 +24,10 @@ amrclaw
/Users/rjl/git/clawpack/amrclaw

--- last commit ---
6aada0a Merge pull request #175 from rjleveque/regression_data_copy_gauges
5c81870 set xlimits and ylimits in quadrants example

--- branch and status ---
## master...origin/master
## setplot_fixes


===========
Expand All @@ -36,10 +36,10 @@ clawutil
/Users/rjl/git/clawpack/clawutil

--- last commit ---
bbc12d6 Merge pull request #105 from mandli/gauge-test-update
c3950d1 Fix call to StringIO to match new way it is imported

--- branch and status ---
## master...origin/master
## claw_git_status_StringIO


===========
Expand All @@ -48,7 +48,7 @@ pyclaw
/Users/rjl/git/clawpack/pyclaw

--- last commit ---
314fd93 Merge pull request #541 from mandli/add-new-gauges
695af06 Merge pull request #550 from clawpack/python3

--- branch and status ---
## master...origin/master
Expand All @@ -60,7 +60,7 @@ visclaw
/Users/rjl/git/clawpack/visclaw

--- last commit ---
72ee0db Merge pull request #187 from rjleveque/remove_ioff
6833be6 Merge pull request #190 from clawpack/python3

--- branch and status ---
## master...origin/master
Expand All @@ -72,7 +72,7 @@ riemann
/Users/rjl/git/clawpack/riemann

--- last commit ---
48a46d3 Merge pull request #113 from rjleveque/shallow_roe_needs_grav
b68d73d Merge pull request #111 from rjleveque/geoclaw_riemann_utils_update

--- branch and status ---
## master...origin/master
Expand All @@ -84,7 +84,11 @@ geoclaw
/Users/rjl/git/clawpack/geoclaw

--- last commit ---
ac8b3e3 Merge pull request #230 from rjleveque/regression_data_copy_gauges
824ca39 fix regression data in tests/multilayer and remove claw_git_diffs.txt: full or recursive garbage

--- branch and status ---
## master...origin/master
## regression_data_update_riemann
M examples/tsunami/bowl-radial/setplot.py
M tests/bowl_slosh/regression_data/claw_git_status.txt
M tests/bowl_slosh/regression_data/gauge00001.txt
M tests/bowl_slosh/regression_tests.py
110 changes: 55 additions & 55 deletions tests/bowl_slosh/regression_data/gauge00001.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
# gauge_id= 1 location=( 0.5000000E+00 0.5000000E+00 ) num_eqn= 4
# Columns: level time h hu hv eta
# gauge_id= 1 location=( 0.5000000E+00 0.5000000E+00 ) num_var= 4
# level, time, q[ 1 2 3], eta, aux[]
02 0.0000000E+00 0.7497749E-01 0.0000000E+00 0.5251101E-01 0.2500000E-01
02 0.1000000E-03 0.7498449E-01 -0.7355608E-05 0.5251591E-01 0.2500700E-01
02 0.8759850E-02 0.7558764E-01 -0.6468797E-03 0.5293693E-01 0.2561015E-01
02 0.1741970E-01 0.7618317E-01 -0.1296505E-02 0.5334458E-01 0.2620569E-01
02 0.2607955E-01 0.7677104E-01 -0.1955928E-02 0.5373868E-01 0.2679355E-01
02 0.3473940E-01 0.7735120E-01 -0.2624844E-02 0.5411904E-01 0.2737371E-01
02 0.4339925E-01 0.7792356E-01 -0.3302944E-02 0.5448544E-01 0.2794607E-01
02 0.5205910E-01 0.7848800E-01 -0.3989917E-02 0.5483759E-01 0.2851051E-01
02 0.6071895E-01 0.7904441E-01 -0.4685446E-02 0.5517523E-01 0.2906692E-01
02 0.6937880E-01 0.7959270E-01 -0.5389208E-02 0.5549814E-01 0.2961522E-01
02 0.7803865E-01 0.8013282E-01 -0.6100881E-02 0.5580618E-01 0.3015534E-01
02 0.8669850E-01 0.8066473E-01 -0.6820139E-02 0.5609920E-01 0.3068724E-01
02 0.9753442E-01 0.8131881E-01 -0.7729625E-02 0.5644534E-01 0.3134133E-01
02 0.1083703E+00 0.8195980E-01 -0.8649841E-02 0.5676740E-01 0.3198231E-01
02 0.1192062E+00 0.8258750E-01 -0.9580109E-02 0.5706503E-01 0.3261002E-01
02 0.1300422E+00 0.8320176E-01 -0.1051974E-01 0.5733787E-01 0.3322427E-01
02 0.1387318E+00 0.8368442E-01 -0.1128006E-01 0.5753795E-01 0.3370693E-01
02 0.1474215E+00 0.8415831E-01 -0.1204559E-01 0.5772184E-01 0.3418082E-01
02 0.1561111E+00 0.8462339E-01 -0.1281597E-01 0.5788945E-01 0.3464590E-01
02 0.1648008E+00 0.8507962E-01 -0.1359082E-01 0.5804070E-01 0.3510213E-01
02 0.1734904E+00 0.8552694E-01 -0.1436978E-01 0.5817549E-01 0.3554946E-01
02 0.1822098E+00 0.8596678E-01 -0.1515515E-01 0.5829411E-01 0.3598929E-01
02 0.1909291E+00 0.8639752E-01 -0.1594390E-01 0.5839596E-01 0.3642003E-01
02 0.1996485E+00 0.8681909E-01 -0.1673565E-01 0.5848092E-01 0.3684160E-01
02 0.2083679E+00 0.8723132E-01 -0.1753001E-01 0.5854877E-01 0.3725383E-01
02 0.2170872E+00 0.8763403E-01 -0.1832657E-01 0.5859925E-01 0.3765655E-01
02 0.2280465E+00 0.8812699E-01 -0.1932985E-01 0.5863907E-01 0.3814951E-01
02 0.2390058E+00 0.8860602E-01 -0.2033556E-01 0.5865346E-01 0.3862854E-01
02 0.2499650E+00 0.8907259E-01 -0.2134332E-01 0.5864495E-01 0.3909511E-01
02 0.2609243E+00 0.8952632E-01 -0.2235236E-01 0.5861314E-01 0.3954884E-01
02 0.2697571E+00 0.8987795E-01 -0.2316532E-01 0.5856302E-01 0.3990047E-01
02 0.2785899E+00 0.9020685E-01 -0.2397459E-01 0.5847533E-01 0.4022936E-01
02 0.2874227E+00 0.9052621E-01 -0.2478294E-01 0.5837122E-01 0.4054872E-01
02 0.2962555E+00 0.9084293E-01 -0.2559183E-01 0.5826195E-01 0.4086544E-01
02 0.3050883E+00 0.9115492E-01 -0.2640043E-01 0.5814455E-01 0.4117743E-01
02 0.3139928E+00 0.9146009E-01 -0.2721369E-01 0.5801094E-01 0.4148260E-01
02 0.3228974E+00 0.9175340E-01 -0.2802390E-01 0.5785836E-01 0.4177591E-01
02 0.3318020E+00 0.9203430E-01 -0.2883040E-01 0.5768620E-01 0.4205681E-01
02 0.3407065E+00 0.9230254E-01 -0.2963259E-01 0.5749419E-01 0.4232505E-01
02 0.3496111E+00 0.9255850E-01 -0.3043009E-01 0.5728293E-01 0.4258101E-01
02 0.3608576E+00 0.9286561E-01 -0.3143006E-01 0.5699025E-01 0.4288812E-01
02 0.3721041E+00 0.9315617E-01 -0.3242214E-01 0.5666957E-01 0.4317869E-01
02 0.3833505E+00 0.9343235E-01 -0.3340664E-01 0.5632153E-01 0.4345487E-01
02 0.3945970E+00 0.9369656E-01 -0.3438467E-01 0.5594572E-01 0.4371907E-01
02 0.4037090E+00 0.9390344E-01 -0.3517321E-01 0.5561985E-01 0.4392595E-01
02 0.4128210E+00 0.9410562E-01 -0.3595939E-01 0.5527447E-01 0.4412814E-01
02 0.4219330E+00 0.9430419E-01 -0.3674418E-01 0.5490949E-01 0.4432670E-01
02 0.4310450E+00 0.9449988E-01 -0.3752768E-01 0.5452506E-01 0.4452240E-01
02 0.4401570E+00 0.9469297E-01 -0.3830929E-01 0.5412114E-01 0.4471548E-01
02 0.4493903E+00 0.9488580E-01 -0.3909949E-01 0.5369143E-01 0.4490831E-01
02 0.4586237E+00 0.9507497E-01 -0.3988735E-01 0.5324144E-01 0.4509748E-01
02 0.4678570E+00 0.9525774E-01 -0.4067109E-01 0.5277249E-01 0.4528026E-01
02 0.4770904E+00 0.9543003E-01 -0.4144714E-01 0.5228636E-01 0.4545255E-01
02 0.4863237E+00 0.9558595E-01 -0.4220904E-01 0.5178410E-01 0.4560847E-01
02 0.4931619E+00 0.9568722E-01 -0.4276104E-01 0.5140154E-01 0.4570974E-01
02 0.8759850E-02 0.7558763E-01 -0.6468797E-03 0.5293694E-01 0.2561014E-01
02 0.1741970E-01 0.7618225E-01 -0.1296497E-02 0.5334473E-01 0.2620476E-01
02 0.2607955E-01 0.7676870E-01 -0.1955904E-02 0.5373907E-01 0.2679122E-01
02 0.3473940E-01 0.7734737E-01 -0.2624783E-02 0.5411970E-01 0.2736988E-01
02 0.4339925E-01 0.7791933E-01 -0.3302832E-02 0.5448613E-01 0.2794184E-01
02 0.5205910E-01 0.7848445E-01 -0.3989757E-02 0.5483802E-01 0.2850697E-01
02 0.6071895E-01 0.7904271E-01 -0.4685290E-02 0.5517516E-01 0.2906522E-01
02 0.6937880E-01 0.7959405E-01 -0.5389169E-02 0.5549738E-01 0.2961656E-01
02 0.7803865E-01 0.8013854E-01 -0.6101133E-02 0.5580453E-01 0.3016105E-01
02 0.8669850E-01 0.8067617E-01 -0.6820904E-02 0.5609644E-01 0.3069868E-01
02 0.9753442E-01 0.8133911E-01 -0.7731392E-02 0.5644092E-01 0.3136163E-01
02 0.1083703E+00 0.8199077E-01 -0.8653056E-02 0.5676093E-01 0.3201328E-01
02 0.1192063E+00 0.8263056E-01 -0.9585221E-02 0.5705613E-01 0.3265308E-01
02 0.1300422E+00 0.8325786E-01 -0.1052719E-01 0.5732622E-01 0.3328037E-01
02 0.1387318E+00 0.8375138E-01 -0.1128967E-01 0.5752390E-01 0.3377389E-01
02 0.1474215E+00 0.8423610E-01 -0.1205759E-01 0.5770533E-01 0.3425861E-01
02 0.1561111E+00 0.8471167E-01 -0.1283054E-01 0.5787048E-01 0.3473418E-01
02 0.1648008E+00 0.8517772E-01 -0.1360810E-01 0.5801935E-01 0.3520023E-01
02 0.1734904E+00 0.8563385E-01 -0.1438981E-01 0.5815192E-01 0.3565637E-01
02 0.1822098E+00 0.8608118E-01 -0.1517786E-01 0.5826857E-01 0.3610370E-01
02 0.1909292E+00 0.8651772E-01 -0.1596909E-01 0.5836880E-01 0.3654024E-01
02 0.1996485E+00 0.8694305E-01 -0.1676296E-01 0.5845259E-01 0.3696557E-01
02 0.2083679E+00 0.8735670E-01 -0.1755891E-01 0.5851981E-01 0.3737921E-01
02 0.2170872E+00 0.8775823E-01 -0.1835636E-01 0.5857028E-01 0.3778074E-01
02 0.2280465E+00 0.8824585E-01 -0.1935947E-01 0.5861106E-01 0.3826837E-01
02 0.2390058E+00 0.8871490E-01 -0.2036338E-01 0.5862758E-01 0.3873741E-01
02 0.2499651E+00 0.8916683E-01 -0.2136755E-01 0.5862245E-01 0.3918934E-01
02 0.2609243E+00 0.8960144E-01 -0.2237112E-01 0.5859525E-01 0.3962396E-01
02 0.2697571E+00 0.8993482E-01 -0.2317859E-01 0.5855007E-01 0.3995734E-01
02 0.2785899E+00 0.9024317E-01 -0.2398073E-01 0.5846799E-01 0.4026568E-01
02 0.2874227E+00 0.9054041E-01 -0.2477994E-01 0.5837046E-01 0.4056293E-01
02 0.2962555E+00 0.9083315E-01 -0.2557727E-01 0.5826789E-01 0.4085567E-01
02 0.3050883E+00 0.9112000E-01 -0.2637444E-01 0.5815740E-01 0.4114251E-01
02 0.3139929E+00 0.9139976E-01 -0.2717637E-01 0.5803128E-01 0.4142227E-01
02 0.3228975E+00 0.9166768E-01 -0.2797485E-01 0.5788578E-01 0.4169020E-01
02 0.3318020E+00 0.9192412E-01 -0.2876905E-01 0.5772053E-01 0.4194663E-01
02 0.3407066E+00 0.9216946E-01 -0.2955895E-01 0.5753511E-01 0.4219198E-01
02 0.3496112E+00 0.9240469E-01 -0.3034469E-01 0.5732996E-01 0.4242720E-01
02 0.3608577E+00 0.9268918E-01 -0.3133151E-01 0.5704410E-01 0.4271169E-01
02 0.3721041E+00 0.9296115E-01 -0.3231229E-01 0.5672919E-01 0.4298366E-01
02 0.3833506E+00 0.9322199E-01 -0.3328731E-01 0.5638607E-01 0.4324451E-01
02 0.3945971E+00 0.9347234E-01 -0.3425662E-01 0.5601494E-01 0.4349485E-01
02 0.4037091E+00 0.9366758E-01 -0.3503783E-01 0.5569340E-01 0.4369010E-01
02 0.4128211E+00 0.9385575E-01 -0.3581491E-01 0.5535343E-01 0.4387826E-01
02 0.4219331E+00 0.9403638E-01 -0.3658737E-01 0.5499511E-01 0.4405890E-01
02 0.4310451E+00 0.9420891E-01 -0.3735457E-01 0.5461874E-01 0.4423142E-01
02 0.4401570E+00 0.9437262E-01 -0.3811573E-01 0.5422468E-01 0.4439514E-01
02 0.4493903E+00 0.9452873E-01 -0.3887991E-01 0.5380784E-01 0.4455124E-01
02 0.4586237E+00 0.9467415E-01 -0.3963594E-01 0.5337384E-01 0.4469667E-01
02 0.4678570E+00 0.9480809E-01 -0.4038279E-01 0.5292318E-01 0.4483060E-01
02 0.4770903E+00 0.9492982E-01 -0.4111949E-01 0.5245631E-01 0.4495233E-01
02 0.4863236E+00 0.9503879E-01 -0.4184516E-01 0.5197365E-01 0.4506130E-01
02 0.4931618E+00 0.9511096E-01 -0.4237519E-01 0.5160611E-01 0.4513348E-01
4 changes: 2 additions & 2 deletions tests/bowl_slosh/regression_data/regression_data_fgmax.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
2.028558505499599818e+01
2.649793541350000510e+02
2.028603161028199864e+01
2.669859327530000428e+02
4 changes: 2 additions & 2 deletions tests/bowl_slosh/regression_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def setUp(self):
topo.write(os.path.join(self.temp_path, "bowl.topotype2"), \
topo_type=2, Z_format="%22.15e")

from .make_fgmax_grid import make_fgmax_grid1
make_fgmax_grid1(self.temp_path)
from . import make_fgmax_grid
make_fgmax_grid.make_fgmax_grid1(self.temp_path)


def runTest(self, save=False, indices=(2, 3)):
Expand Down
Loading