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

WIP: Rename regression_test.py to use pytest #562

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

WIP: Rename regression_test.py to use pytest #562

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
674c670
Rename regression_test.py to use pytest
rjleveque Sep 1, 2023
9bb634b
update tests/*/setrun.py to latest form for topofile specification, r…
rjleveque Sep 1, 2023
0b41f48
simplify tests/dtopo1/regression_test.py and save gauge00002 data
rjleveque Sep 1, 2023
201a35a
update bowl_slosh/regression_data
rjleveque Sep 1, 2023
b6519f0
update particles/regression_data
rjleveque Sep 1, 2023
aa2b2ba
remove unused import of wip in a regression_test
rjleveque Sep 6, 2023
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
63 changes: 30 additions & 33 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,113 +1,110 @@
Clawpack Git Status
Diffs can be found in /Users/rjl/clawpack_src/clawpack_master/geoclaw/tests/bowl_slosh/regression_data/claw_git_diffs.txt
Diffs can be found in /Users/rjl/git/clawpack/geoclaw/tests/bowl_slosh/regression_data/claw_git_diffs.txt

Fri, 23 Oct 2020 16:12:16 PDT
$CLAW = /Users/rjl/clawpack_src/clawpack_master
$FC = gfortran
Fri, 01 Sep 2023 12:31:28 PDT
$CLAW = /Users/rjl/git/clawpack
$FC = not set


===========
clawpack
===========
/Users/rjl/clawpack_src/clawpack_master/
/Users/rjl/git/clawpack/

--- last commit ---
be2b38d (HEAD -> master, origin/master, origin/HEAD) Merge pull request #189 from clawpack/no_version_repetition
cc03572 (HEAD -> geoclaw_1d) need geoclaw_1d in __init__.py until it's merged into geoclaw proper

--- branch and status ---
## master...origin/master
## geoclaw_1d
M amrclaw
M classic
M clawutil
M geoclaw
M pyclaw
M riemann
M visclaw


===========
classic
===========
/Users/rjl/clawpack_src/clawpack_master/classic
/Users/rjl/git/clawpack/classic

--- last commit ---
13f06a2 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #88 from rjleveque/travis_noPy2
4fb4d1a (HEAD -> pytest, rjleveque/pytest) Using pytest instead of nose requires renaming to regression_test.py

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


===========
amrclaw
===========
/Users/rjl/clawpack_src/clawpack_master/amrclaw
/Users/rjl/git/clawpack/amrclaw

--- last commit ---
6da6e17 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #266 from rjleveque/region_tools_ixy
dc5c685 (HEAD -> pytest, rjleveque/pytest) rename regression_test.py for pytest

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


===========
clawutil
===========
/Users/rjl/clawpack_src/clawpack_master/clawutil
/Users/rjl/git/clawpack/clawutil

--- last commit ---
116ffb7 (HEAD -> master, tag: v5.7.1, origin/master, origin/HEAD) Merge pull request #151 from rjleveque/b4run
a118b82 (HEAD -> test_save_gauge_binary, rjleveque/test_save_gauge_binary) Modify test.py so that when saving regression data, check for binary gauge file

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


===========
pyclaw
===========
/Users/rjl/clawpack_src/clawpack_master/pyclaw
/Users/rjl/git/clawpack/pyclaw

--- last commit ---
41e15d8 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #650 from kbarnhart/barnhark/fix_vtk_docstring_formatting
53766ffc (HEAD -> importlib, rjleveque/importlib) replace imp by importlib

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


===========
visclaw
===========
/Users/rjl/clawpack_src/clawpack_master/visclaw
/Users/rjl/git/clawpack/visclaw

--- last commit ---
b03b0d4 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #280 from rjleveque/mapc2p_exists
2f5b832 (HEAD -> more_plot_attributes, rjleveque/more_plot_attributes) add time_label_fontsize to gaugetools.py

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


===========
riemann
===========
/Users/rjl/clawpack_src/clawpack_master/riemann
/Users/rjl/git/clawpack/riemann

--- last commit ---
e326696 (HEAD -> rpt2_geoclaw) refactor rpt2_geoclaw.f, cleaned up and modified behavior
d177660 (HEAD -> master, tag: v5.9.0, tag: v5.8.2, tag: v5.8.1, rjleveque/master, origin/master, origin/HEAD) Merge pull request #163 from carlosmunozmoncayo/fix_dry_states_hlle

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


===========
geoclaw
===========
/Users/rjl/clawpack_src/clawpack_master/geoclaw
/Users/rjl/git/clawpack/geoclaw

--- last commit ---
13ff68f (HEAD -> rpt2_regression_data) Merge branch 'master' into rpt2_regression_data
0b41f48a (HEAD -> pytest, rjleveque/pytest) simplify tests/dtopo1/regression_test.py and save gauge00002 data

--- branch and status ---
## rpt2_regression_data
## pytest
M tests/bowl_slosh/regression_data/claw_git_status.txt
M tests/chile2010_adjoint/regression_data/claw_git_status.txt
M tests/chile2010_adjoint/regression_data/gauge00001.txt
M tests/storm_surge/regression_data/claw_git_status.txt
M tests/storm_surge/regression_data/gauge00001.txt
M tests/bowl_slosh/regression_data/gauge00001.txt
1 change: 1 addition & 0 deletions tests/bowl_slosh/regression_data/gauge00001.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# gauge_id= 1 location=( 0.5000000000E+00 0.5000000000E+00 ) num_var= 4
# Stationary gauge
# level, time, q[ 1 2 3], eta, aux[]
# file format ascii, time series follow in this file
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.7558763E-01 -0.6468797E-03 0.5293691E-01 0.2561014E-01
Expand Down
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 @@
1.969088003364149841e+01
2.577996146300000078e+02
1.969084096264149863e+01
2.577696308800000224e+02
0 tests/bowl_slosh/regression_tests.py → tests/bowl_slosh/regression_test.py
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions tests/bowl_slosh/setrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,6 @@ def setgeo(rundata):
# Refinement data
refinement_data = rundata.refinement_data
refinement_data.wave_tolerance = 1.e-2
refinement_data.deep_depth = 1e2
refinement_data.max_level_deep = 3
refinement_data.variable_dt_refinement_ratios = True

# == settopo.data values ==
Expand Down
1 change: 0 additions & 1 deletion tests/chile2010_adjoint/regression_tests.py → tests/chile2010_adjoint/regression_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import clawpack.geoclaw.test as test
import clawpack.geoclaw.topotools as topotools
from clawpack.clawutil.test import wip


try:
Expand Down
2 changes: 0 additions & 2 deletions tests/chile2010_adjoint/setrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,6 @@ def setgeo(rundata):
refinement_data = rundata.refinement_data
refinement_data.variable_dt_refinement_ratios = True
refinement_data.wave_tolerance = 1.e-1 # not used for adjoint flagging
refinement_data.deep_depth = 1e2
refinement_data.max_level_deep = 3

# == settopo.data values ==
topo_data = rundata.topo_data
Expand Down
58 changes: 32 additions & 26 deletions tests/dtopo1/regression_data/claw_git_status.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,93 +1,97 @@
Clawpack Git Status
Diffs can be found in /Users/rjl/clawpack_src/clawpack_master/geoclaw/tests/dtopo1/regression_data/claw_git_diffs.txt
Diffs can be found in /Users/rjl/git/clawpack/geoclaw/tests/dtopo1/regression_data/claw_git_diffs.txt

Sat, 23 Apr 2022 07:59:12 PDT
$CLAW = /Users/rjl/clawpack_src/clawpack_master
$FC = gfortran
Fri, 01 Sep 2023 12:24:02 PDT
$CLAW = /Users/rjl/git/clawpack
$FC = not set


===========
clawpack
===========
/Users/rjl/clawpack_src/clawpack_master/
/Users/rjl/git/clawpack/

--- last commit ---
531a8fb (HEAD -> master, tag: v5.8.2, origin/master, origin/HEAD) Merge pull request #208 from rjleveque/v5.8.2rc
cc03572 (HEAD -> geoclaw_1d) need geoclaw_1d in __init__.py until it's merged into geoclaw proper

--- branch and status ---
## master...origin/master
## geoclaw_1d
M amrclaw
M classic
M clawutil
M geoclaw
M pyclaw
M visclaw


===========
classic
===========
/Users/rjl/clawpack_src/clawpack_master/classic
/Users/rjl/git/clawpack/classic

--- last commit ---
13f06a2 (HEAD -> master, tag: v5.8.2, tag: v5.8.1, tag: v5.8.0, origin/master, origin/HEAD) Merge pull request #88 from rjleveque/travis_noPy2
4fb4d1a (HEAD -> pytest, rjleveque/pytest) Using pytest instead of nose requires renaming to regression_test.py

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


===========
amrclaw
===========
/Users/rjl/clawpack_src/clawpack_master/amrclaw
/Users/rjl/git/clawpack/amrclaw

--- last commit ---
3cae22c (HEAD -> gauge_format_comment, rjleveque/gauge_format_comment) fix the comment written to gauges.data about file_formats to the right place
dc5c685 (HEAD -> pytest, rjleveque/pytest) rename regression_test.py for pytest

--- branch and status ---
## gauge_format_comment
## pytest


===========
clawutil
===========
/Users/rjl/clawpack_src/clawpack_master/clawutil
/Users/rjl/git/clawpack/clawutil

--- last commit ---
7c2cca5 (HEAD -> master, tag: v5.8.2, origin_push/master, origin/master, origin/HEAD) minor change to print dir in make_all.py
5ec7587 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #153 from TrellixVulnTeam/master

--- branch and status ---
## master...origin/master
M src/python/clawutil/test.py


===========
pyclaw
===========
/Users/rjl/clawpack_src/clawpack_master/pyclaw
/Users/rjl/git/clawpack/pyclaw

--- last commit ---
12f484b (HEAD -> gauge_binary_output, rjleveque/gauge_binary_output) update gauges.py to support binary files
53766ffc (HEAD -> importlib, rjleveque/importlib) replace imp by importlib

--- branch and status ---
## gauge_binary_output
## importlib


===========
visclaw
===========
/Users/rjl/clawpack_src/clawpack_master/visclaw
/Users/rjl/git/clawpack/visclaw

--- last commit ---
b5c137e (HEAD -> master, tag: v5.8.2, tag: v5.8.1, origin/master, origin/HEAD) Merge pull request #283 from clawpack/revert-282-master
2f5b832 (HEAD -> more_plot_attributes, rjleveque/more_plot_attributes) add time_label_fontsize to gaugetools.py

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


===========
riemann
===========
/Users/rjl/clawpack_src/clawpack_master/riemann
/Users/rjl/git/clawpack/riemann

--- last commit ---
d177660 (HEAD -> master, tag: v5.8.2, tag: v5.8.1, origin/master, origin/HEAD) Merge pull request #163 from carlosmunozmoncayo/fix_dry_states_hlle
d177660 (HEAD -> master, tag: v5.9.0, tag: v5.8.2, tag: v5.8.1, rjleveque/master, origin/master, origin/HEAD) Merge pull request #163 from carlosmunozmoncayo/fix_dry_states_hlle

--- branch and status ---
## master...origin/master
Expand All @@ -96,11 +100,13 @@ d177660 (HEAD -> master, tag: v5.8.2, tag: v5.8.1, origin/master, origin/HEAD) M
===========
geoclaw
===========
/Users/rjl/clawpack_src/clawpack_master/geoclaw
/Users/rjl/git/clawpack/geoclaw

--- last commit ---
e08d06c (HEAD -> gauge_binary_output) redo tests/dtopo1 so binary gauge data produced is compared with archived ascii data for portability
9bb634b6 (HEAD -> pytest) update tests/*/setrun.py to latest form for topofile specification, remove max_level_deep

--- branch and status ---
## gauge_binary_output
## pytest
M tests/dtopo1/regression_data/claw_git_status.txt
M tests/dtopo1/regression_data/gauge00001.txt
M tests/dtopo1/regression_test.py
65 changes: 33 additions & 32 deletions tests/dtopo1/regression_data/gauge00001.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
# gauge_id= 1 location=( -0.4500000000E+00 0.5000000000E-01 ) num_var= 4
# Stationary gauge
# level, time, q[ 1 2 3], eta, aux[]
# file format ascii, time series follow in this file
01 0.0000000E+00 0.1670354E+04 0.0000000E+00 0.0000000E+00 0.0000000E+00
01 0.1000000E-03 0.1670354E+04 -0.2095048E-16 0.2259404E-16 0.0000000E+00
01 0.2010000E-01 0.1670354E+04 -0.4254947E-14 -0.8172831E-14 0.8000000E-03
01 0.4010000E-01 0.1670354E+04 0.5819691E-14 -0.1212059E-13 0.1608000E+00
01 0.6010000E-01 0.1670354E+04 -0.4014625E-13 -0.7647041E-14 0.3208000E+00
01 0.8010000E-01 0.1670354E+04 -0.1407626E-12 -0.3200552E-14 0.4808000E+00
01 0.1001000E+00 0.1670354E+04 -0.3564991E-12 0.3459770E-13 0.6408000E+00
01 0.1201000E+00 0.1670354E+04 -0.7701462E-12 0.3321028E-14 0.8008000E+00
01 0.1401000E+00 0.1670354E+04 -0.1664041E-11 0.4411106E-14 0.9608000E+00
01 0.1601000E+00 0.1670354E+04 -0.3139460E-11 0.3313218E-14 0.1120800E+01
01 0.1801000E+00 0.1670354E+04 -0.5483114E-11 0.1606608E-13 0.1280800E+01
01 0.2001000E+00 0.1670354E+04 -0.8950367E-11 0.4095204E-13 0.1440800E+01
01 0.2201000E+00 0.1670354E+04 -0.1391295E-10 0.4333297E-13 0.1600800E+01
01 0.2401000E+00 0.1670354E+04 -0.2074865E-10 -0.1254212E-13 0.1760800E+01
01 0.2601000E+00 0.1670354E+04 -0.2986315E-10 -0.4351022E-13 0.1920800E+01
01 0.2801000E+00 0.1670354E+04 -0.4170933E-10 -0.8542154E-13 0.1919200E+01
01 0.3001000E+00 0.1670354E+04 -0.5679361E-10 -0.1395729E-12 0.1759200E+01
01 0.3201000E+00 0.1670354E+04 -0.7564883E-10 -0.2244642E-12 0.1599200E+01
01 0.3401000E+00 0.1670354E+04 -0.9869279E-10 -0.2755337E-12 0.1439200E+01
01 0.3601000E+00 0.1670354E+04 -0.1263340E-09 -0.4248967E-12 0.1279200E+01
01 0.3801000E+00 0.1670354E+04 -0.1590105E-09 -0.5223234E-12 0.1119200E+01
01 0.4001000E+00 0.1670354E+04 -0.1970602E-09 -0.6986541E-12 0.9592000E+00
01 0.4201000E+00 0.1670354E+04 -0.2407769E-09 -0.8972857E-12 0.7992000E+00
01 0.4401000E+00 0.1670354E+04 -0.2904320E-09 -0.1068274E-11 0.6392000E+00
01 0.4601000E+00 0.1670354E+04 -0.3462857E-09 -0.1313170E-11 0.4792000E+00
01 0.4801000E+00 0.1670354E+04 -0.4084783E-09 -0.1596181E-11 0.3192000E+00
01 0.5001000E+00 0.1670354E+04 -0.4772279E-09 -0.1910956E-11 0.1592000E+00
01 0.1000000E-03 0.1670354E+04 -0.2487870E-16 -0.5237617E-17 0.0000000E+00
01 0.2010000E-01 0.1670354E+04 -0.5000888E-14 0.1558100E-13 0.8000000E-03
01 0.4010000E-01 0.1670354E+04 0.3986141E-13 0.6036581E-13 0.1608000E+00
01 0.6010000E-01 0.1670354E+04 0.3341623E-13 0.4658024E-13 0.3208000E+00
01 0.8010000E-01 0.1670354E+04 -0.3213469E-13 0.4543282E-13 0.4808000E+00
01 0.1001000E+00 0.1670354E+04 -0.1831726E-12 0.9385122E-13 0.6408000E+00
01 0.1201000E+00 0.1670354E+04 -0.6165491E-12 0.5757722E-13 0.8008000E+00
01 0.1401000E+00 0.1670354E+04 -0.1443017E-11 0.2783625E-13 0.9608000E+00
01 0.1601000E+00 0.1670354E+04 -0.2875124E-11 0.5484491E-13 0.1120800E+01
01 0.1801000E+00 0.1670354E+04 -0.5198076E-11 0.4463318E-13 0.1280800E+01
01 0.2001000E+00 0.1670354E+04 -0.8691210E-11 0.2992055E-13 0.1440800E+01
01 0.2201000E+00 0.1670354E+04 -0.1366597E-10 0.4341540E-13 0.1600800E+01
01 0.2401000E+00 0.1670354E+04 -0.2048590E-10 0.1567151E-13 0.1760800E+01
01 0.2601000E+00 0.1670354E+04 -0.2956229E-10 -0.2940827E-13 0.1920800E+01
01 0.2801000E+00 0.1670354E+04 -0.4140464E-10 -0.8907199E-13 0.1919200E+01
01 0.3001000E+00 0.1670354E+04 -0.5648760E-10 -0.1149228E-12 0.1759200E+01
01 0.3201000E+00 0.1670354E+04 -0.7528301E-10 -0.1551257E-12 0.1599200E+01
01 0.3401000E+00 0.1670354E+04 -0.9829374E-10 -0.2792799E-12 0.1439200E+01
01 0.3601000E+00 0.1670354E+04 -0.1259589E-09 -0.4043543E-12 0.1279200E+01
01 0.3801000E+00 0.1670354E+04 -0.1586356E-09 -0.5319886E-12 0.1119200E+01
01 0.4001000E+00 0.1670354E+04 -0.1966521E-09 -0.6846737E-12 0.9592000E+00
01 0.4201000E+00 0.1670354E+04 -0.2403688E-09 -0.8797690E-12 0.7992000E+00
01 0.4401000E+00 0.1670354E+04 -0.2899739E-09 -0.1056003E-11 0.6392000E+00
01 0.4601000E+00 0.1670354E+04 -0.3457778E-09 -0.1298235E-11 0.4792000E+00
01 0.4801000E+00 0.1670354E+04 -0.4079592E-09 -0.1544906E-11 0.3192000E+00
01 0.5001000E+00 0.1670354E+04 -0.4766924E-09 -0.1734770E-11 0.1592000E+00
01 0.5201000E+00 0.1670354E+04 0.7013439E-01 0.1938293E-01 0.1759764E+01
01 0.5401000E+00 0.1670354E+04 0.1456842E+00 0.4027289E-01 0.1896393E+01
01 0.5601000E+00 0.1670354E+04 0.2264719E+00 0.6262063E-01 0.2028534E+01
Expand All @@ -46,9 +47,9 @@
03 0.8201000E+00 0.1670329E+04 0.1575403E+01 0.4266669E+00 0.3290879E+01
03 0.8401000E+00 0.1670329E+04 0.1681403E+01 0.4529610E+00 0.3290879E+01
03 0.8601000E+00 0.1670329E+04 0.1789377E+01 0.4798173E+00 0.3337624E+01
03 0.8801000E+00 0.1670329E+04 0.1899148E+01 0.5071868E+00 0.3417739E+01
03 0.9001000E+00 0.1670329E+04 0.2010540E+01 0.5350205E+00 0.3417740E+01
03 0.9201000E+00 0.1670329E+04 0.2123246E+01 0.5632325E+00 0.3447724E+01
03 0.9401000E+00 0.1670329E+04 0.2237074E+01 0.5917698E+00 0.3493547E+01
03 0.9601000E+00 0.1670329E+04 0.2351849E+01 0.6205836E+00 0.3493549E+01
03 0.9801000E+00 0.1670329E+04 0.2467291E+01 0.6495955E+00 0.3507073E+01
03 0.8801000E+00 0.1670329E+04 0.1899148E+01 0.5071851E+00 0.3417739E+01
03 0.9001000E+00 0.1670329E+04 0.2010540E+01 0.5350156E+00 0.3417740E+01
03 0.9201000E+00 0.1670329E+04 0.2123246E+01 0.5632247E+00 0.3447724E+01
03 0.9401000E+00 0.1670329E+04 0.2237074E+01 0.5917582E+00 0.3493547E+01
03 0.9601000E+00 0.1670329E+04 0.2351849E+01 0.6205676E+00 0.3493550E+01
03 0.9801000E+00 0.1670329E+04 0.2467291E+01 0.6495754E+00 0.3507073E+01
Binary file added tests/dtopo1/regression_data/gauge00002.bin
View file
Open in desktop
Binary file not shown.
Loading
Loading