From 674c670d52ec2048a0941e3a4b42dd15c8104d1a Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Fri, 1 Sep 2023 09:26:58 -0700 Subject: [PATCH 1/6] Rename regression_test.py to use pytest Gives 4 errors currently, 3 of which are related to precision of results. --- tests/bowl_slosh/{regression_tests.py => regression_test.py} | 0 .../chile2010_adjoint/{regression_tests.py => regression_test.py} | 0 tests/dtopo1/{regression_tests.py => regression_test.py} | 0 tests/multilayer/{regression_tests.py => regression_test.py} | 0 tests/netcdf_topo/{regression_tests.py => regression_test.py} | 0 tests/particles/{regression_tests.py => regression_test.py} | 0 tests/storm_surge/{regression_tests.py => regression_test.py} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename tests/bowl_slosh/{regression_tests.py => regression_test.py} (100%) rename tests/chile2010_adjoint/{regression_tests.py => regression_test.py} (100%) rename tests/dtopo1/{regression_tests.py => regression_test.py} (100%) rename tests/multilayer/{regression_tests.py => regression_test.py} (100%) rename tests/netcdf_topo/{regression_tests.py => regression_test.py} (100%) rename tests/particles/{regression_tests.py => regression_test.py} (100%) rename tests/storm_surge/{regression_tests.py => regression_test.py} (100%) diff --git a/tests/bowl_slosh/regression_tests.py b/tests/bowl_slosh/regression_test.py similarity index 100% rename from tests/bowl_slosh/regression_tests.py rename to tests/bowl_slosh/regression_test.py diff --git a/tests/chile2010_adjoint/regression_tests.py b/tests/chile2010_adjoint/regression_test.py similarity index 100% rename from tests/chile2010_adjoint/regression_tests.py rename to tests/chile2010_adjoint/regression_test.py diff --git a/tests/dtopo1/regression_tests.py b/tests/dtopo1/regression_test.py similarity index 100% rename from tests/dtopo1/regression_tests.py rename to tests/dtopo1/regression_test.py diff --git a/tests/multilayer/regression_tests.py b/tests/multilayer/regression_test.py similarity index 100% rename from tests/multilayer/regression_tests.py rename to tests/multilayer/regression_test.py diff --git a/tests/netcdf_topo/regression_tests.py b/tests/netcdf_topo/regression_test.py similarity index 100% rename from tests/netcdf_topo/regression_tests.py rename to tests/netcdf_topo/regression_test.py diff --git a/tests/particles/regression_tests.py b/tests/particles/regression_test.py similarity index 100% rename from tests/particles/regression_tests.py rename to tests/particles/regression_test.py diff --git a/tests/storm_surge/regression_tests.py b/tests/storm_surge/regression_test.py similarity index 100% rename from tests/storm_surge/regression_tests.py rename to tests/storm_surge/regression_test.py From 9bb634b6a2764f9ff4fdb3e3764ec17f5e450e27 Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Fri, 1 Sep 2023 11:31:34 -0700 Subject: [PATCH 2/6] update tests/*/setrun.py to latest form for topofile specification, remove max_level_deep --- tests/bowl_slosh/setrun.py | 2 -- tests/chile2010_adjoint/setrun.py | 2 -- tests/dtopo1/setrun.py | 2 -- tests/multilayer/setrun.py | 10 ++++------ tests/netcdf_topo/setrun.py | 10 ++++------ tests/storm_surge/setrun.py | 9 +++------ 6 files changed, 11 insertions(+), 24 deletions(-) diff --git a/tests/bowl_slosh/setrun.py b/tests/bowl_slosh/setrun.py index 1d2120913..1f9288b33 100644 --- a/tests/bowl_slosh/setrun.py +++ b/tests/bowl_slosh/setrun.py @@ -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 == diff --git a/tests/chile2010_adjoint/setrun.py b/tests/chile2010_adjoint/setrun.py index e4d246c90..cbf2c8f54 100644 --- a/tests/chile2010_adjoint/setrun.py +++ b/tests/chile2010_adjoint/setrun.py @@ -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 diff --git a/tests/dtopo1/setrun.py b/tests/dtopo1/setrun.py index 906af6574..efd568c24 100644 --- a/tests/dtopo1/setrun.py +++ b/tests/dtopo1/setrun.py @@ -375,8 +375,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 == diff --git a/tests/multilayer/setrun.py b/tests/multilayer/setrun.py index 472cf02d8..5f8319716 100644 --- a/tests/multilayer/setrun.py +++ b/tests/multilayer/setrun.py @@ -448,19 +448,17 @@ def setgeo(rundata): refinement_data = rundata.refinement_data refinement_data.variable_dt_refinement_ratios = True refinement_data.wave_tolerance = 1.e-1 - refinement_data.deep_depth = 1e2 - refinement_data.max_level_deep = 3 # == settopo.data values == topo_data = rundata.topo_data # for topography, append lines of the form - # [topotype, minlevel, maxlevel, t1, t2, fname] - topo_data.topofiles.append([2, 1, 5, 0.0, 1e10, 'jump_topo.topotype2']) + # [topotype, fname] + topo_data.topofiles.append([2, 'jump_topo.topotype2']) # == setdtopo.data values == dtopo_data = rundata.dtopo_data # for moving topography, append lines of the form : (<= 1 allowed for now!) - # [topotype, minlevel,maxlevel,fname] + # [topotype, fname] # == setqinit.data values == qinit_data = rundata.qinit_data @@ -529,4 +527,4 @@ def write_topo_file(run_data, out_file): rundata.write() - write_topo_file(rundata, 'jump_topo.topotype2') \ No newline at end of file + write_topo_file(rundata, 'jump_topo.topotype2') diff --git a/tests/netcdf_topo/setrun.py b/tests/netcdf_topo/setrun.py index 88a1d8b93..3b99442d4 100644 --- a/tests/netcdf_topo/setrun.py +++ b/tests/netcdf_topo/setrun.py @@ -357,21 +357,19 @@ 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 == topo_data = rundata.topo_data # for topography, append lines of the form - # [topotype, minlevel, maxlevel, t1, t2, fname] - topo_data.topofiles.append([4, 1, 10, 0., 1.e10, 'bowl.nc']) - # topo_data.topofiles.append([2, 1, 10, 0., 1.e10, 'bowl.tt2']) + # [topotype, fname] + topo_data.topofiles.append([4, 'bowl.nc']) + # topo_data.topofiles.append([2, 'bowl.tt2']) # == setdtopo.data values == dtopo_data = rundata.dtopo_data # for moving topography, append lines of the form : (<= 1 allowed for now!) - # [topotype, minlevel,maxlevel,fname] + # [topotype, fname] # == setqinit.data values == rundata.qinit_data.qinit_type = 0 diff --git a/tests/storm_surge/setrun.py b/tests/storm_surge/setrun.py index 24fb6dd9f..54dbc09e3 100644 --- a/tests/storm_surge/setrun.py +++ b/tests/storm_surge/setrun.py @@ -384,24 +384,21 @@ def setgeo(rundata): refine_data = rundata.refinement_data refine_data.wave_tolerance = 1.0 refine_data.speed_tolerance = [1.0,2.0,3.0,4.0] - refine_data.deep_depth = 300.0 - refine_data.max_level_deep = 4 refine_data.variable_dt_refinement_ratios = True # == settopo.data values == topo_data = rundata.topo_data topo_data.topofiles = [] # for topography, append lines of the form - # [topotype, minlevel, maxlevel, t1, t2, fname] + # [topotype, fname] # See regions for control over these regions, need better bathy data for the # smaller domains - topo_data.topofiles.append([3, 1, 5, rundata.clawdata.t0, rundata.clawdata.tfinal, - 'gulf_caribbean.tt3']) + topo_data.topofiles.append([3, 'gulf_caribbean.tt3']) # == setdtopo.data values == dtopo_data = rundata.dtopo_data dtopo_data.dtopofiles = [] # for moving topography, append lines of the form : (<= 1 allowed for now!) - # [topotype, minlevel,maxlevel,fname] + # [topotype, fname] # == setqinit.data values == rundata.qinit_data.qinit_type = 0 From 0b41f48a26860f006cfa55925d39e6833de5d62a Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Fri, 1 Sep 2023 12:27:31 -0700 Subject: [PATCH 3/6] simplify tests/dtopo1/regression_test.py and save gauge00002 data regression_data/gauge00001.txt also updated, very minor changes from previous --- .../regression_data/claw_git_status.txt | 58 ++++--- tests/dtopo1/regression_data/gauge00001.txt | 65 +++---- tests/dtopo1/regression_data/gauge00002.bin | Bin 0 -> 2448 bytes tests/dtopo1/regression_data/gauge00002.txt | 4 + tests/dtopo1/regression_test.py | 158 ++++-------------- 5 files changed, 99 insertions(+), 186 deletions(-) create mode 100644 tests/dtopo1/regression_data/gauge00002.bin create mode 100644 tests/dtopo1/regression_data/gauge00002.txt diff --git a/tests/dtopo1/regression_data/claw_git_status.txt b/tests/dtopo1/regression_data/claw_git_status.txt index 0b45c33b3..8dfd62d0c 100644 --- a/tests/dtopo1/regression_data/claw_git_status.txt +++ b/tests/dtopo1/regression_data/claw_git_status.txt @@ -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 @@ -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 diff --git a/tests/dtopo1/regression_data/gauge00001.txt b/tests/dtopo1/regression_data/gauge00001.txt index a4268c40b..20639c790 100644 --- a/tests/dtopo1/regression_data/gauge00001.txt +++ b/tests/dtopo1/regression_data/gauge00001.txt @@ -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 @@ -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 diff --git a/tests/dtopo1/regression_data/gauge00002.bin b/tests/dtopo1/regression_data/gauge00002.bin new file mode 100644 index 0000000000000000000000000000000000000000..7056704fe96bcda953226526e8a19d9ca75a6fd6 GIT binary patch literal 2448 zcmZwJdo+~!9|!QS5G4s&lDmYZQtKd@K95Z$-KJEdwpCQWkeV*GBAarF`uW+`ZOfw6 zSY38S)*`-Ixl8WJATh|Dsg%-ie$O+j@A#ebn?L3`bIxnt=kq+@&*yUopS=v}f{) zh;ROVeDBfXRN`AdtTZgIHei{Ul${u``I?2UGI2Lw@=Ei$Qi`;#2!zvkHilfUy?M&V<@zQ4%7MYwc zBHqLOfQ+TnWxT~!q383frF8vF-W%d0ZKXB`E0z-9o2U{N)EbNRuWA3WO^?1`eReFKeWe}6K_IY*_owv8{cqO+Ar0l$3k{Y-Wc&|j|UU&%qxj6c7Eb$ub7J0$LYA% z9yehj5tH|ccnB1fUdyc_zB-^b!Qs+h*x%^XX{ltoAO2?YM8qF9@ILF8Ttht1{&{x@ z^*4T^%DKHHLJy-0Ox`5%52Sm-O@?ZTU%lz)mCFiCa6xPY#a3B~QMR#?LZ-xzb-5)q zTGkWqFwx*Os924I`LTjfa|)x6%U`D&N$P=;*34l42I4IYWi%tx8*odJnd@Z3T8u31 z@b*~A{f4G+DpnLdC%)OB?s}C>3;rcncD_=IGe+L)qCd=(JkRQ|y0&(O7sUH+bQvhy z+JR?E1&*%p*^5yc`$*gw$$6=JZGIQw+(i8NcNH<`pLOF=E%mLBvfMEe?)i3gucROL zZ7h>x{mLiae%)`XYH|ZubTMY;^i?F%peD>`n=V))!SbS76 z@0~8{S+(>KHBNam_PlC2HgidgT=ak9n|4R0Sb#LnKYL4gPCpQ(*VZ~$Xec`#P~sz_j#qsPe27f{Ft1`19UJ( z=O#zeZ`JpzpYIy%fMZ>S%8ZZK;?0(ysD$qvURCtSr2*1#8|T_0>YqI-gi{L@+m~Dw zK(KqVD&swN%c`qP)I;z{(A;{hzX08dO&J9#;?={Q`eiITVez%gYK(6>>Ft|Q&WBwI zW@8V+@&H|!b=Syh2JyL~(9xC`o$!?$SDo>vw0}G>r{fho{YLwe;C2C^MZH#!^`(j5 zceHr&;khnIu->tN@iC^}psm*ltHwJHam|VWRXp@#$;c2d-8N&^72R%d^s!#Zc%=hc zRh}nagQsofxqmm60dgO@Rn;W%DO)I2x591+)>PMKy#AV{K_P-Z2#UG!K=W=TAg7XS zwP2nKdQ%EDADwF7CJ@Qla$WtvB zPtgmY7hW5Sav1Mpc&?5!^d7YD*(cmrZUUqe_iX7jAMlo00DaK#eYV)I)?h2ihmS#F z!ZtmZdwf8XJ4@ueW|4fu1H<$J=!dkxNU@*YTzi#o`3drGaBBm%v;cC+waIp#O?+v+ z*`Wo3eyG;DEcV&EHo3_4jKd=S8#a5Q6;SLuqv`&LgC|!QG5|b&oY?;nI7hG{Nd#)_ zvRvm(dTt#PrF}9a`AV6;`Iedvg7xWAv9DYI@lCJ$B+PtNXVhxj4#@kLyikq;sVBpz zD=6{VAXw!qil67_R?ii&YKUr1P?F{AbO7=)-Vip;b7J))exT2v*M3Co{rV#8JVc0U zQ*bICkre>)+rt({OY%R@+;?r0+Av*zhuHH2R=vE`Ek$KiEN)F5p?!%1Dt{~SH_k9` zD8pbogPY5omm_D$Iksj7^?ll%@U)grKyPC-E2jB1y?pu&Wd!tGRq_~rzxtS!G?u15 U{b%Kg?d9|y9L%}kKX(rGUrG|X5C8xG literal 0 HcmV?d00001 diff --git a/tests/dtopo1/regression_data/gauge00002.txt b/tests/dtopo1/regression_data/gauge00002.txt new file mode 100644 index 000000000..79256cb9f --- /dev/null +++ b/tests/dtopo1/regression_data/gauge00002.txt @@ -0,0 +1,4 @@ +# gauge_id= 2 location=( -0.4500000000E+00 0.5000000000E-01 ) num_var= 4 +# Stationary gauge +# level, time, q[ 1 2 3], eta, aux[] +# file format binary64, time series in .bin file diff --git a/tests/dtopo1/regression_test.py b/tests/dtopo1/regression_test.py index 2deb9e6f6..ddf0d7319 100644 --- a/tests/dtopo1/regression_test.py +++ b/tests/dtopo1/regression_test.py @@ -1,10 +1,9 @@ #!/usr/bin/env python -r"""Regression tests. Execute via: - python regression_tests.py -to test, or - python regression_tests.py True -to create new regression data for archiving. +r"""Particles regression test for GeoClaw + +To create new regression data use + `python regression_tests.py True` """ from __future__ import absolute_import @@ -17,136 +16,34 @@ import clawpack.geoclaw.test as test import clawpack.geoclaw.topotools as topotools -import clawpack.geoclaw.dtopotools as dtopotools + class DTopoTests(test.GeoClawRegressionTest): - + + r"""dtopo1 regression test for GeoClaw""" + def setUp(self): super(DTopoTests, self).setUp() + start_dir = os.getcwd() + + # Make topography and dtopo - # Make topography - h0 = 1000.0 - topo_func = lambda x,y: -h0*(1 + 0.5 * numpy.cos(x - y)) - topo = topotools.Topography(topo_func=topo_func) - topo.topo_type = 2 - topo.x = numpy.linspace(-10.0, 10.0, 201) - topo.y = numpy.linspace(-10.0, 10.0, 201) - topo.write(os.path.join(self.temp_path, "topo1.topotype2"), \ - topo_type=2, Z_format="%22.15e") - - h0 = 1000.0 - topo_func = lambda x,y: -h0*(1. + numpy.exp(x+y)) - topo = topotools.Topography(topo_func=topo_func) - topo.topo_type = 2 - topo.x = numpy.linspace(-0.5, -0.3, 21) - topo.y = numpy.linspace(-0.1, 0.4, 51) - topo.write(os.path.join(self.temp_path, "topo2.topotype2"), \ - topo_type=2, Z_format="%22.15e") - - # Make dtopography - subfault_path = os.path.join(self.test_path, "dtopo1.csv") - input_units = {'slip': 'm', 'depth': 'km', 'length': 'km', 'width': 'km'} - fault = dtopotools.CSVFault() - fault.read(subfault_path, input_units=input_units, - coordinate_specification="top center") - fault.rupture_type = 'dynamic' - times = numpy.linspace(0.0, 1.0, 25) - x = numpy.linspace(-0.4,0.6,151) - y = numpy.linspace(-0.4,0.4,121) - dtopo = fault.create_dtopography(x,y,times=times) - dtopo.write(os.path.join(self.temp_path, "dtopo1.tt3"), dtopo_type=3) - - subfault_path = os.path.join(self.test_path, "dtopo2.csv") - input_units = {'slip': 'm', 'depth': 'km', 'length': 'km', 'width': 'km'} - fault = dtopotools.CSVFault() - fault.read(subfault_path, input_units=input_units, - coordinate_specification="top center") - fault.rupture_type = 'dynamic' - times = numpy.linspace(0.5, 1.2, 25) - x = numpy.linspace(-0.9,0.1,201) - y = numpy.linspace(-0.4,0.4,161) - dtopo = fault.create_dtopography(x,y,times=times) - dtopo.write(os.path.join(self.temp_path, "dtopo2.tt3"), dtopo_type=3) - - # copy existing file: + shutil.copy(os.path.join(self.test_path, "maketopo.py"), + self.temp_path) + shutil.copy(os.path.join(self.test_path, "dtopo1.csv"), + self.temp_path) + shutil.copy(os.path.join(self.test_path, "dtopo2.csv"), + self.temp_path) shutil.copy(os.path.join(self.test_path, "dtopo3.tt1"), self.temp_path) - - - def check_gauges(self, save=False, gauge_id=1, regression_gauge_id=1, - indices=[0], rtol=1e-14, atol=1e-8, tolerance=None): - - r"""Basic test to assert gauge equality - - :Input: - - *save* (bool) - If *True* will save the output from this test to - the file *regresion_data.txt*. Default is *False*. - - *gauge_id* (int) - The gauge to test. - - *regression_gauge_id* (int) - The gauge to test against. - - *indices* (tuple) - Contains indices to compare in the gague - comparison. Defaults to *(0)*. - - *rtol* (float) - Relative tolerance used in the comparison, default - is *1e-14*. Note that the old *tolerance* input is now synonymous - with this parameter. - - *atol* (float) - Absolute tolerance used in the comparison, default - is *1e-08*. - """ - - import clawpack.pyclaw.gauges as gauges - import clawpack.clawutil.claw_git_status as claw_git_status - - if isinstance(tolerance, float): - rtol = tolerance - - if not(isinstance(indices, tuple) or isinstance(indices, list)): - indices = tuple(indices) - - # Get gauge data - gauge = gauges.GaugeSolution(gauge_id, path=self.temp_path) - - # Get regression comparison data - regression_data_path = os.path.join(self.test_path, "regression_data") - if save: - gauge_file_name = "gauge%s.txt" % str(regression_gauge_id).zfill(5) - shutil.copy(os.path.join(self.temp_path, gauge_file_name), - regression_data_path) - claw_git_status.make_git_status_file(outdir=regression_data_path) - - regression_gauge = gauges.GaugeSolution(regression_gauge_id, - path=regression_data_path) - - # Compare data - try: - for n in indices: - numpy.testing.assert_allclose(gauge.q[n, :], - regression_gauge.q[n, :], - rtol=rtol, atol=atol, - verbose=False) - except AssertionError as e: - err_msg = "\n".join((e.args[0], - "Gauge Match Failed for gauge = %s" % gauge_id)) - err_msg = "\n".join((err_msg, " failures in fields:")) - failure_indices = [] - for n in indices: - if ~numpy.allclose(gauge.q[n, :], regression_gauge.q[n, :], - rtol=rtol, atol=atol): - failure_indices.append(str(n)) - index_str = ", ".join(failure_indices) - raise AssertionError(" ".join((err_msg, index_str))) - + os.chdir(self.temp_path) + os.system('python maketopo.py') + os.chdir(start_dir) def runTest(self, save=False, indices=(2, 3)): r"""DTopography basic regression test - - :Input: - - *save* (bool) - If *True* will save the output from this test to - the file *regresion_data.txt*. Passed to *check_gauges*. Default is - *False*. - - *indices* (tuple) - Contains indices to compare in the gague - comparison and passed to *check_gauges*. Defaults to *(2, 3)*. - """ # Write out data files @@ -155,13 +52,19 @@ def runTest(self, save=False, indices=(2, 3)): # Run code self.run_code() - + + import clawpack.pyclaw.gauges as gauges + gauge = gauges.GaugeSolution(1, path=self.temp_path) + #print('+++ Gauge 1:\n', gauge.q) + gauge = gauges.GaugeSolution(2, path=self.temp_path) + #print('+++ Gauge 2:\n', gauge.q) + # Perform tests - self.check_gauges(save=save, gauge_id=1, regression_gauge_id=1, + self.check_gauges(save=save, gauge_id=1, indices=(2, 3)) print('gauge 1 ascii agrees') - self.check_gauges(save=save, gauge_id=2, regression_gauge_id=1, - indices=(2, 3), rtol=1e-6, atol=1e-6) + self.check_gauges(save=save, gauge_id=2, + indices=(2, 3)) print('gauge 2 binary agrees') # If we have gotten here then we do not need to copy the run results @@ -180,4 +83,3 @@ def runTest(self, save=False, indices=(2, 3)): test.tearDown() sys.exit(0) unittest.main() - From 201a35a497e778cf5c90a9deab1ae91dd6c295c1 Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Fri, 1 Sep 2023 12:32:23 -0700 Subject: [PATCH 4/6] update bowl_slosh/regression_data --- .../regression_data/claw_git_status.txt | 63 +++++++++---------- .../bowl_slosh/regression_data/gauge00001.txt | 1 + .../regression_data/regression_data_fgmax.txt | 4 +- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/tests/bowl_slosh/regression_data/claw_git_status.txt b/tests/bowl_slosh/regression_data/claw_git_status.txt index 7d673159a..d97fc79de 100644 --- a/tests/bowl_slosh/regression_data/claw_git_status.txt +++ b/tests/bowl_slosh/regression_data/claw_git_status.txt @@ -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 diff --git a/tests/bowl_slosh/regression_data/gauge00001.txt b/tests/bowl_slosh/regression_data/gauge00001.txt index 3ffec4ab3..b3938d9ba 100644 --- a/tests/bowl_slosh/regression_data/gauge00001.txt +++ b/tests/bowl_slosh/regression_data/gauge00001.txt @@ -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 diff --git a/tests/bowl_slosh/regression_data/regression_data_fgmax.txt b/tests/bowl_slosh/regression_data/regression_data_fgmax.txt index 94ba3bb20..746c57238 100644 --- a/tests/bowl_slosh/regression_data/regression_data_fgmax.txt +++ b/tests/bowl_slosh/regression_data/regression_data_fgmax.txt @@ -1,2 +1,2 @@ -1.969088003364149841e+01 -2.577996146300000078e+02 +1.969084096264149863e+01 +2.577696308800000224e+02 From b6519f07a1d23bcaf1b562414be2d8059d5e5857 Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Fri, 1 Sep 2023 12:34:02 -0700 Subject: [PATCH 5/6] update particles/regression_data --- .../regression_data/claw_git_status.txt | 41 ++--- .../particles/regression_data/gauge00001.txt | 161 +++++++++--------- .../particles/regression_data/gauge00002.txt | 153 ++++++++--------- tests/particles/regression_test.py | 4 +- 4 files changed, 182 insertions(+), 177 deletions(-) diff --git a/tests/particles/regression_data/claw_git_status.txt b/tests/particles/regression_data/claw_git_status.txt index 475512977..6e309d3c1 100644 --- a/tests/particles/regression_data/claw_git_status.txt +++ b/tests/particles/regression_data/claw_git_status.txt @@ -1,9 +1,9 @@ Clawpack Git Status Diffs can be found in /Users/rjl/git/clawpack/geoclaw/tests/particles/regression_data/claw_git_diffs.txt -Thu, 12 Nov 2020 14:18:09 PST +Fri, 01 Sep 2023 12:32:58 PDT $CLAW = /Users/rjl/git/clawpack -$FC = gfortran +$FC = not set =========== @@ -12,11 +12,16 @@ clawpack /Users/rjl/git/clawpack/ --- last commit --- -c8f3e6b (HEAD -> master, origin/master, origin/HEAD) Merge pull request #196 from rjleveque/read_memsize +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 =========== @@ -25,10 +30,10 @@ 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 =========== @@ -37,10 +42,10 @@ amrclaw /Users/rjl/git/clawpack/amrclaw --- last commit --- -ee85c1f (HEAD -> master, origin/master, origin/HEAD) Merge pull request #267 from rjleveque/read_memsize +dc5c685 (HEAD -> pytest, rjleveque/pytest) rename regression_test.py for pytest --- branch and status --- -## master...origin/master +## pytest =========== @@ -49,10 +54,10 @@ clawutil /Users/rjl/git/clawpack/clawutil --- last commit --- -116ffb7 (HEAD -> master, rjleveque/master, 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 =========== @@ -61,10 +66,10 @@ 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 =========== @@ -73,10 +78,10 @@ visclaw /Users/rjl/git/clawpack/visclaw --- last commit --- -b03b0d4 (HEAD -> master, rjleveque/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 =========== @@ -85,7 +90,7 @@ riemann /Users/rjl/git/clawpack/riemann --- last commit --- -78c2236 (HEAD -> master, origin/master, origin/HEAD) Merge pull request #159 from rjleveque/rpt2_geoclaw +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 @@ -97,12 +102,10 @@ geoclaw /Users/rjl/git/clawpack/geoclaw --- last commit --- -f61dd4d (HEAD -> remove_allowflag, rjleveque/remove_allowflag) update tests/dtopo1 regression data, small changes +201a35a4 (HEAD -> pytest) update bowl_slosh/regression_data --- branch and status --- -## remove_allowflag +## pytest M tests/particles/regression_data/claw_git_status.txt M tests/particles/regression_data/gauge00001.txt M tests/particles/regression_data/gauge00002.txt - M tests/particles/setplot.py - M tests/particles/setrun.py diff --git a/tests/particles/regression_data/gauge00001.txt b/tests/particles/regression_data/gauge00001.txt index 72f955f1c..73c5c4bcd 100644 --- a/tests/particles/regression_data/gauge00001.txt +++ b/tests/particles/regression_data/gauge00001.txt @@ -1,16 +1,17 @@ # gauge_id= 1 location=( 0.1500000000E+02 0.2000000000E+02 ) 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.5000000E+02 0.0000000E+00 0.0000000E+00 0.0000000E+00 01 0.1600000E-01 0.5000000E+02 0.0000000E+00 0.0000000E+00 0.0000000E+00 01 0.7657825E-01 0.5000000E+02 0.0000000E+00 -0.6148741E-15 0.0000000E+00 - 01 0.1370296E+00 0.5054383E+02 0.1225646E+02 -0.2784175E-14 0.5438274E+00 - 01 0.1916364E+00 0.5669055E+02 0.1706952E+03 -0.1396203E-13 0.6690552E+01 - 01 0.2447527E+00 0.6812748E+02 0.5048566E+03 -0.5837406E-13 0.1812748E+02 - 01 0.2979420E+00 0.6881777E+02 0.5307423E+03 -0.1342771E-13 0.1881777E+02 - 01 0.3514170E+00 0.6840896E+02 0.5207376E+03 -0.1574627E-13 0.1840896E+02 - 01 0.4048374E+00 0.6846376E+02 0.5200862E+03 -0.5525919E-13 0.1846376E+02 - 01 0.4579184E+00 0.6835484E+02 0.5201305E+03 -0.4714103E-06 0.1835484E+02 + 01 0.1370296E+00 0.5054383E+02 0.1225646E+02 -0.2790994E-14 0.5438274E+00 + 01 0.1916364E+00 0.5669055E+02 0.1706952E+03 -0.1356376E-13 0.6690552E+01 + 01 0.2447527E+00 0.6812748E+02 0.5048566E+03 -0.5357505E-13 0.1812748E+02 + 01 0.2979420E+00 0.6881777E+02 0.5307423E+03 -0.8725361E-13 0.1881777E+02 + 01 0.3514170E+00 0.6840896E+02 0.5207376E+03 -0.1013374E-12 0.1840896E+02 + 01 0.4048374E+00 0.6846376E+02 0.5200862E+03 -0.9285306E-13 0.1846376E+02 + 01 0.4579184E+00 0.6835484E+02 0.5201305E+03 -0.4714104E-06 0.1835484E+02 01 0.5111466E+00 0.6830520E+02 0.5211793E+03 0.1766912E-04 0.1830520E+02 01 0.5647282E+00 0.6831513E+02 0.5214256E+03 0.6503307E-03 0.1831513E+02 01 0.6182759E+00 0.6829875E+02 0.5197274E+03 0.1323336E-01 0.1829875E+02 @@ -61,76 +62,76 @@ 01 0.2652204E+01 0.7072214E+02 0.4834356E+03 -0.3816237E+02 0.2072214E+02 01 0.2696745E+01 0.7057382E+02 0.4859867E+03 -0.3755489E+02 0.2057382E+02 01 0.2744155E+01 0.7044962E+02 0.4881621E+03 -0.3743863E+02 0.2044962E+02 - 01 0.2791420E+01 0.7034957E+02 0.4899080E+03 -0.3776453E+02 0.2034957E+02 - 01 0.2838461E+01 0.7029985E+02 0.4915119E+03 -0.3897570E+02 0.2029985E+02 - 01 0.2885428E+01 0.7035288E+02 0.4924078E+03 -0.4250724E+02 0.2035288E+02 - 01 0.2932357E+01 0.7057064E+02 0.4918217E+03 -0.4990194E+02 0.2057064E+02 - 01 0.2979303E+01 0.7095882E+02 0.4893704E+03 -0.6096686E+02 0.2095882E+02 - 01 0.3026284E+01 0.7139165E+02 0.4864728E+03 -0.7353860E+02 0.2139165E+02 - 01 0.3073290E+01 0.7169984E+02 0.4849288E+03 -0.8307876E+02 0.2169984E+02 - 01 0.3120238E+01 0.7178518E+02 0.4856070E+03 -0.8724514E+02 0.2178518E+02 - 01 0.3166951E+01 0.7165417E+02 0.4881334E+03 -0.8544439E+02 0.2165417E+02 - 01 0.3213452E+01 0.7138654E+02 0.4923127E+03 -0.7900136E+02 0.2138654E+02 - 01 0.3259729E+01 0.7109205E+02 0.4963590E+03 -0.6899194E+02 0.2109205E+02 - 01 0.3305781E+01 0.7090314E+02 0.4994655E+03 -0.5559507E+02 0.2090314E+02 - 01 0.3351662E+01 0.7086582E+02 0.5010209E+03 -0.4011950E+02 0.2086582E+02 - 01 0.3397411E+01 0.7102456E+02 0.4999646E+03 -0.2418985E+02 0.2102456E+02 - 01 0.3441856E+01 0.7124816E+02 0.4983180E+03 -0.9997504E+01 0.2124816E+02 - 01 0.3486287E+01 0.7144880E+02 0.4965662E+03 0.3972453E+00 0.2144880E+02 - 01 0.3530763E+01 0.7153044E+02 0.4966477E+03 0.5560398E+01 0.2153044E+02 - 01 0.3575252E+01 0.7148096E+02 0.4982122E+03 0.6525141E+01 0.2148096E+02 - 01 0.3619475E+01 0.7131572E+02 0.5017468E+03 0.4352430E+01 0.2131572E+02 - 01 0.3663481E+01 0.7103407E+02 0.5066952E+03 0.1082582E+01 0.2103407E+02 - 01 0.3707377E+01 0.7067113E+02 0.5127614E+03 -0.2484888E+01 0.2067113E+02 - 01 0.3750928E+01 0.7025852E+02 0.5189448E+03 -0.5652512E+01 0.2025852E+02 - 01 0.3794149E+01 0.6984064E+02 0.5244316E+03 -0.7870616E+01 0.1984064E+02 - 01 0.3837209E+01 0.6949727E+02 0.5286361E+03 -0.9164023E+01 0.1949727E+02 - 01 0.3880236E+01 0.6931476E+02 0.5306938E+03 -0.9050115E+01 0.1931476E+02 - 01 0.3923301E+01 0.6926979E+02 0.5315603E+03 -0.7469652E+01 0.1926979E+02 - 01 0.3966524E+01 0.6930406E+02 0.5325022E+03 -0.4700327E+01 0.1930406E+02 - 01 0.4009944E+01 0.6940223E+02 0.5327790E+03 -0.1690704E+01 0.1940223E+02 - 01 0.4053372E+01 0.6953293E+02 0.5322620E+03 0.7676834E+00 0.1953293E+02 - 01 0.4096890E+01 0.6962718E+02 0.5316242E+03 0.2757041E+01 0.1962718E+02 - 01 0.4140523E+01 0.6963245E+02 0.5310630E+03 0.3739597E+01 0.1963245E+02 - 01 0.4184289E+01 0.6954633E+02 0.5304174E+03 0.3393965E+01 0.1954633E+02 - 01 0.4228188E+01 0.6940506E+02 0.5293357E+03 0.1860263E+01 0.1940506E+02 - 01 0.4272204E+01 0.6923509E+02 0.5281895E+03 -0.1169134E+00 0.1923509E+02 - 01 0.4316309E+01 0.6906091E+02 0.5273560E+03 -0.1610825E+01 0.1906091E+02 - 01 0.4360455E+01 0.6890053E+02 0.5269968E+03 -0.2247554E+01 0.1890053E+02 - 01 0.4404587E+01 0.6877178E+02 0.5268369E+03 -0.1992802E+01 0.1877178E+02 - 01 0.4448683E+01 0.6868506E+02 0.5266345E+03 -0.7700987E+00 0.1868506E+02 - 01 0.4492752E+01 0.6863403E+02 0.5263750E+03 0.1198948E+01 0.1863403E+02 - 01 0.4536812E+01 0.6863064E+02 0.5258298E+03 0.3566606E+01 0.1863064E+02 - 01 0.4580999E+01 0.6865957E+02 0.5250323E+03 0.6090194E+01 0.1865957E+02 - 01 0.4625089E+01 0.6870172E+02 0.5244920E+03 0.8385270E+01 0.1870172E+02 - 01 0.4669234E+01 0.6876753E+02 0.5241777E+03 0.1025168E+02 0.1876753E+02 - 01 0.4713456E+01 0.6886509E+02 0.5241705E+03 0.1186497E+02 0.1886509E+02 - 01 0.4757875E+01 0.6899507E+02 0.5247577E+03 0.1345027E+02 0.1899507E+02 - 01 0.4802418E+01 0.6915416E+02 0.5258079E+03 0.1502111E+02 0.1915416E+02 - 01 0.4846871E+01 0.6934566E+02 0.5268507E+03 0.1646816E+02 0.1934566E+02 - 01 0.4891271E+01 0.6956782E+02 0.5271862E+03 0.1754333E+02 0.1956782E+02 - 01 0.4935558E+01 0.6980510E+02 0.5264003E+03 0.1783510E+02 0.1980510E+02 - 01 0.4979253E+01 0.7003348E+02 0.5245763E+03 0.1719222E+02 0.2003348E+02 - 01 0.5022748E+01 0.7022233E+02 0.5220099E+03 0.1553358E+02 0.2022233E+02 - 01 0.5065928E+01 0.7033169E+02 0.5190092E+03 0.1308181E+02 0.2033169E+02 - 01 0.5108871E+01 0.7032618E+02 0.5163328E+03 0.9908020E+01 0.2032618E+02 - 01 0.5151740E+01 0.7022093E+02 0.5141635E+03 0.6118854E+01 0.2022093E+02 - 01 0.5194658E+01 0.7005999E+02 0.5121861E+03 0.1970314E+01 0.2005999E+02 - 01 0.5237704E+01 0.6987303E+02 0.5102888E+03 -0.2194830E+01 0.1987303E+02 - 01 0.5280924E+01 0.6965479E+02 0.5090656E+03 -0.6128895E+01 0.1965479E+02 - 01 0.5324341E+01 0.6941431E+02 0.5087220E+03 -0.9849426E+01 0.1941431E+02 - 01 0.5367957E+01 0.6918154E+02 0.5089114E+03 -0.1350084E+02 0.1918154E+02 - 01 0.5411764E+01 0.6898988E+02 0.5093246E+03 -0.1734916E+02 0.1898988E+02 - 01 0.5455738E+01 0.6886151E+02 0.5097791E+03 -0.2175097E+02 0.1886151E+02 - 01 0.5499840E+01 0.6881212E+02 0.5100862E+03 -0.2709642E+02 0.1881212E+02 - 01 0.5544011E+01 0.6884549E+02 0.5101154E+03 -0.3353914E+02 0.1884549E+02 - 01 0.5588211E+01 0.6895255E+02 0.5098952E+03 -0.4086366E+02 0.1895255E+02 - 01 0.5632414E+01 0.6911004E+02 0.5094997E+03 -0.4855841E+02 0.1911004E+02 - 01 0.5676605E+01 0.6928721E+02 0.5091399E+03 -0.5601443E+02 0.1928721E+02 - 01 0.5720776E+01 0.6945905E+02 0.5092732E+03 -0.6288878E+02 0.1945905E+02 - 01 0.5764784E+01 0.6962146E+02 0.5102688E+03 -0.6913088E+02 0.1962146E+02 - 01 0.5808620E+01 0.6977931E+02 0.5124947E+03 -0.7498576E+02 0.1977931E+02 - 01 0.5852370E+01 0.6993513E+02 0.5162710E+03 -0.8068430E+02 0.1993513E+02 - 01 0.5896137E+01 0.7009315E+02 0.5212804E+03 -0.8617057E+02 0.2009315E+02 - 01 0.5940007E+01 0.7024430E+02 0.5269150E+03 -0.9111560E+02 0.2024430E+02 - 01 0.5984039E+01 0.7036494E+02 0.5321863E+03 -0.9459330E+02 0.2036494E+02 + 01 0.2791419E+01 0.7034957E+02 0.4899080E+03 -0.3776451E+02 0.2034957E+02 + 01 0.2838459E+01 0.7029985E+02 0.4915118E+03 -0.3897557E+02 0.2029985E+02 + 01 0.2885439E+01 0.7035291E+02 0.4924078E+03 -0.4250850E+02 0.2035291E+02 + 01 0.2932366E+01 0.7057070E+02 0.4918215E+03 -0.4990354E+02 0.2057070E+02 + 01 0.2979300E+01 0.7095879E+02 0.4893707E+03 -0.6096603E+02 0.2095879E+02 + 01 0.3026281E+01 0.7139163E+02 0.4864729E+03 -0.7353792E+02 0.2139163E+02 + 01 0.3073286E+01 0.7169982E+02 0.4849287E+03 -0.8307815E+02 0.2169982E+02 + 01 0.3120211E+01 0.7178518E+02 0.4856057E+03 -0.8724411E+02 0.2178518E+02 + 01 0.3166885E+01 0.7165444E+02 0.4881281E+03 -0.8545048E+02 0.2165444E+02 + 01 0.3213356E+01 0.7138715E+02 0.4923039E+03 -0.7901820E+02 0.2138715E+02 + 01 0.3259597E+01 0.7109279E+02 0.4963489E+03 -0.6902617E+02 0.2109279E+02 + 01 0.3305631E+01 0.7090352E+02 0.4994594E+03 -0.5564284E+02 0.2090352E+02 + 01 0.3351494E+01 0.7086574E+02 0.5010172E+03 -0.4017717E+02 0.2086574E+02 + 01 0.3397235E+01 0.7102375E+02 0.4999712E+03 -0.2424694E+02 0.2102375E+02 + 01 0.3441664E+01 0.7124725E+02 0.4983245E+03 -0.1005000E+02 0.2124725E+02 + 01 0.3486084E+01 0.7144812E+02 0.4965704E+03 0.3637713E+00 0.2144812E+02 + 01 0.3530557E+01 0.7153030E+02 0.4966430E+03 0.5547056E+01 0.2153030E+02 + 01 0.3575057E+01 0.7148131E+02 0.4982053E+03 0.6531000E+01 0.2148131E+02 + 01 0.3619285E+01 0.7131642E+02 0.5017335E+03 0.4365358E+01 0.2131642E+02 + 01 0.3663286E+01 0.7103506E+02 0.5066791E+03 0.1099182E+01 0.2103506E+02 + 01 0.3707172E+01 0.7067216E+02 0.5127456E+03 -0.2464194E+01 0.2067216E+02 + 01 0.3750716E+01 0.7025941E+02 0.5189379E+03 -0.5633421E+01 0.2025941E+02 + 01 0.3793942E+01 0.6984124E+02 0.5244322E+03 -0.7856478E+01 0.1984124E+02 + 01 0.3837020E+01 0.6949796E+02 0.5286355E+03 -0.9163054E+01 0.1949796E+02 + 01 0.3880047E+01 0.6931595E+02 0.5306801E+03 -0.9064889E+01 0.1931595E+02 + 01 0.3923103E+01 0.6927117E+02 0.5315374E+03 -0.7495076E+01 0.1927117E+02 + 01 0.3966312E+01 0.6930544E+02 0.5324736E+03 -0.4735822E+01 0.1930544E+02 + 01 0.4009729E+01 0.6940391E+02 0.5327457E+03 -0.1729524E+01 0.1940391E+02 + 01 0.4053141E+01 0.6953498E+02 0.5322264E+03 0.7260054E+00 0.1953498E+02 + 01 0.4096621E+01 0.6963053E+02 0.5315672E+03 0.2711407E+01 0.1963053E+02 + 01 0.4140200E+01 0.6963725E+02 0.5309904E+03 0.3692165E+01 0.1963725E+02 + 01 0.4183898E+01 0.6955236E+02 0.5303367E+03 0.3355766E+01 0.1955236E+02 + 01 0.4227735E+01 0.6941199E+02 0.5292580E+03 0.1830716E+01 0.1941199E+02 + 01 0.4271708E+01 0.6924265E+02 0.5280991E+03 -0.1430140E+00 0.1924265E+02 + 01 0.4315792E+01 0.6906828E+02 0.5272587E+03 -0.1635186E+01 0.1906828E+02 + 01 0.4359932E+01 0.6890724E+02 0.5268971E+03 -0.2266882E+01 0.1890724E+02 + 01 0.4404067E+01 0.6877805E+02 0.5267404E+03 -0.2023116E+01 0.1877805E+02 + 01 0.4448168E+01 0.6869152E+02 0.5265284E+03 -0.8196187E+00 0.1869152E+02 + 01 0.4492242E+01 0.6864146E+02 0.5262265E+03 0.1133921E+01 0.1864146E+02 + 01 0.4536311E+01 0.6863620E+02 0.5257039E+03 0.3511290E+01 0.1863620E+02 + 01 0.4580398E+01 0.6866380E+02 0.5249154E+03 0.6044627E+01 0.1866380E+02 + 01 0.4624525E+01 0.6870374E+02 0.5244100E+03 0.8359960E+01 0.1870374E+02 + 01 0.4668713E+01 0.6876862E+02 0.5241090E+03 0.1023865E+02 0.1876862E+02 + 01 0.4712971E+01 0.6886701E+02 0.5240837E+03 0.1184304E+02 0.1886701E+02 + 01 0.4757309E+01 0.6899876E+02 0.5246247E+03 0.1338924E+02 0.1899876E+02 + 01 0.4801702E+01 0.6916038E+02 0.5256133E+03 0.1490456E+02 0.1916038E+02 + 01 0.4846054E+01 0.6935687E+02 0.5265512E+03 0.1628537E+02 0.1935687E+02 + 01 0.4890225E+01 0.6958743E+02 0.5267255E+03 0.1728616E+02 0.1958743E+02 + 01 0.4934125E+01 0.6983535E+02 0.5257401E+03 0.1751113E+02 0.1983535E+02 + 01 0.4977774E+01 0.7007722E+02 0.5237075E+03 0.1682078E+02 0.2007722E+02 + 01 0.5021233E+01 0.7027539E+02 0.5210068E+03 0.1515074E+02 0.2027539E+02 + 01 0.5064403E+01 0.7038572E+02 0.5180282E+03 0.1278401E+02 0.2038572E+02 + 01 0.5107311E+01 0.7037437E+02 0.5154986E+03 0.9714195E+01 0.2037437E+02 + 01 0.5150135E+01 0.7026328E+02 0.5134789E+03 0.5990468E+01 0.2026328E+02 + 01 0.5193003E+01 0.7010010E+02 0.5115539E+03 0.1892870E+01 0.2010010E+02 + 01 0.5235997E+01 0.6990738E+02 0.5097499E+03 -0.2194775E+01 0.1990738E+02 + 01 0.5279164E+01 0.6968186E+02 0.5086689E+03 -0.6091610E+01 0.1968186E+02 + 01 0.5322528E+01 0.6943768E+02 0.5083711E+03 -0.9828848E+01 0.1943768E+02 + 01 0.5366098E+01 0.6920903E+02 0.5084551E+03 -0.1353394E+02 0.1920903E+02 + 01 0.5409870E+01 0.6902351E+02 0.5087222E+03 -0.1744252E+02 0.1902351E+02 + 01 0.5453824E+01 0.6889972E+02 0.5090545E+03 -0.2187885E+02 0.1889972E+02 + 01 0.5497917E+01 0.6884887E+02 0.5093126E+03 -0.2718600E+02 0.1884887E+02 + 01 0.5542095E+01 0.6887457E+02 0.5094322E+03 -0.3353354E+02 0.1887457E+02 + 01 0.5586303E+01 0.6896777E+02 0.5094198E+03 -0.4069555E+02 0.1896777E+02 + 01 0.5630494E+01 0.6910658E+02 0.5093143E+03 -0.4818277E+02 0.1910658E+02 + 01 0.5674650E+01 0.6926470E+02 0.5092599E+03 -0.5542206E+02 0.1926470E+02 + 01 0.5718773E+01 0.6942260E+02 0.5095821E+03 -0.6209111E+02 0.1942260E+02 + 01 0.5762776E+01 0.6957547E+02 0.5107042E+03 -0.6820173E+02 0.1957547E+02 + 01 0.5806600E+01 0.6972809E+02 0.5130051E+03 -0.7400264E+02 0.1972809E+02 + 01 0.5850323E+01 0.6988828E+02 0.5166075E+03 -0.7973567E+02 0.1988828E+02 + 01 0.5894040E+01 0.7005803E+02 0.5213165E+03 -0.8538201E+02 0.2005803E+02 + 01 0.5937855E+01 0.7022999E+02 0.5266477E+03 -0.9056655E+02 0.2022999E+02 + 01 0.5981839E+01 0.7037511E+02 0.5316296E+03 -0.9436313E+02 0.2037511E+02 diff --git a/tests/particles/regression_data/gauge00002.txt b/tests/particles/regression_data/gauge00002.txt index 6c2cac802..c16e021c9 100644 --- a/tests/particles/regression_data/gauge00002.txt +++ b/tests/particles/regression_data/gauge00002.txt @@ -1,6 +1,7 @@ # gauge_id= 2 location=( 0.1500000000E+02 0.3000000000E+02 ) num_var= 4 # Lagrangian particle, q[2,3] replaced by (x(t),y(t)) # level, time, q[ 1 2 3], eta, aux[] +# file format ascii, time series follow in this file 01 0.0000000E+00 0.5000000E+02 0.1500000E+02 0.3000000E+02 0.0000000E+00 01 0.1600000E-01 0.5000000E+02 0.1500000E+02 0.3000000E+02 0.0000000E+00 01 0.7657825E-01 0.5000000E+02 0.1500000E+02 0.3000000E+02 0.0000000E+00 @@ -58,79 +59,79 @@ 01 0.2520374E+01 0.7112537E+02 0.3079977E+02 0.2846913E+02 0.2147093E+02 01 0.2563921E+01 0.7064904E+02 0.3109581E+02 0.2833256E+02 0.2102497E+02 01 0.2607888E+01 0.7010921E+02 0.3140123E+02 0.2819239E+02 0.2056232E+02 - 01 0.2652204E+01 0.6950834E+02 0.3171618E+02 0.2804686E+02 0.2013164E+02 - 01 0.2696745E+01 0.6895495E+02 0.3205995E+02 0.2788656E+02 0.1972200E+02 - 01 0.2744155E+01 0.6834247E+02 0.3241297E+02 0.2772186E+02 0.1922903E+02 - 01 0.2791420E+01 0.6764591E+02 0.3277685E+02 0.2755478E+02 0.1861506E+02 - 01 0.2838461E+01 0.6688744E+02 0.3315518E+02 0.2738634E+02 0.1790138E+02 - 01 0.2885428E+01 0.6604968E+02 0.3355105E+02 0.2721708E+02 0.1717407E+02 - 01 0.2932357E+01 0.6552426E+02 0.3396250E+02 0.2704718E+02 0.1682280E+02 - 01 0.2979303E+01 0.6587724E+02 0.3437760E+02 0.2687841E+02 0.1723017E+02 - 01 0.3026284E+01 0.6665303E+02 0.3478516E+02 0.2671261E+02 0.1812222E+02 - 01 0.3073290E+01 0.6704338E+02 0.3518792E+02 0.2654961E+02 0.1864890E+02 - 01 0.3120238E+01 0.6653735E+02 0.3559902E+02 0.2639076E+02 0.1831303E+02 - 01 0.3166951E+01 0.6581548E+02 0.3602428E+02 0.2623944E+02 0.1779979E+02 - 01 0.3213452E+01 0.6552218E+02 0.3646012E+02 0.2609924E+02 0.1767439E+02 - 01 0.3259729E+01 0.6559815E+02 0.3690428E+02 0.2597437E+02 0.1788182E+02 - 01 0.3305781E+01 0.6579975E+02 0.3735685E+02 0.2586560E+02 0.1818893E+02 - 01 0.3351662E+01 0.6586849E+02 0.3781819E+02 0.2577208E+02 0.1831977E+02 - 01 0.3397411E+01 0.6567246E+02 0.3827635E+02 0.2569064E+02 0.1817351E+02 - 01 0.3441856E+01 0.6530887E+02 0.3874392E+02 0.2561333E+02 0.1785021E+02 - 01 0.3486287E+01 0.6489792E+02 0.3922095E+02 0.2553654E+02 0.1746302E+02 - 01 0.3530763E+01 0.6462920E+02 0.3970619E+02 0.2545794E+02 0.1710592E+02 - 01 0.3575252E+01 0.6448997E+02 0.4019553E+02 0.2537684E+02 0.1676415E+02 - 01 0.3619475E+01 0.6440446E+02 0.4068831E+02 0.2529260E+02 0.1646964E+02 - 01 0.3663481E+01 0.6442457E+02 0.4118385E+02 0.2520554E+02 0.1627266E+02 - 01 0.3707377E+01 0.6453383E+02 0.4167989E+02 0.2511957E+02 0.1610981E+02 - 01 0.3750928E+01 0.6466242E+02 0.4217937E+02 0.2503854E+02 0.1591217E+02 - 01 0.3794149E+01 0.6478905E+02 0.4268435E+02 0.2496103E+02 0.1575739E+02 - 01 0.3837209E+01 0.6477515E+02 0.4319538E+02 0.2488659E+02 0.1556083E+02 - 01 0.3880236E+01 0.6457390E+02 0.4371257E+02 0.2481962E+02 0.1524378E+02 - 01 0.3923301E+01 0.6429227E+02 0.4423931E+02 0.2476542E+02 0.1484615E+02 - 01 0.3966524E+01 0.6395938E+02 0.4477715E+02 0.2472246E+02 0.1440445E+02 - 01 0.4009944E+01 0.6368770E+02 0.4532299E+02 0.2468821E+02 0.1402897E+02 - 01 0.4053372E+01 0.6346660E+02 0.4587104E+02 0.2466971E+02 0.1373065E+02 - 01 0.4096890E+01 0.6330874E+02 0.4642033E+02 0.2467136E+02 0.1351496E+02 - 01 0.4140523E+01 0.6320057E+02 0.4697317E+02 0.2469109E+02 0.1335147E+02 - 01 0.4184289E+01 0.6314059E+02 0.4753131E+02 0.2472649E+02 0.1323661E+02 - 01 0.4228188E+01 0.6331491E+02 0.4808115E+02 0.2478055E+02 0.1338986E+02 - 01 0.4272204E+01 0.6349289E+02 0.4862574E+02 0.2485481E+02 0.1354860E+02 - 01 0.4316309E+01 0.6372144E+02 0.4916853E+02 0.2494974E+02 0.1375737E+02 - 01 0.4360455E+01 0.6412322E+02 0.4970759E+02 0.2506309E+02 0.1414340E+02 - 01 0.4404587E+01 0.6470247E+02 0.5023390E+02 0.2519248E+02 0.1471984E+02 - 01 0.4448683E+01 0.6518597E+02 0.5075022E+02 0.2533920E+02 0.1520037E+02 - 01 0.4492752E+01 0.6555366E+02 0.5125968E+02 0.2550308E+02 0.1556236E+02 - 01 0.4536812E+01 0.6585030E+02 0.5176190E+02 0.2567728E+02 0.1585506E+02 - 01 0.4580999E+01 0.6606602E+02 0.5225001E+02 0.2585473E+02 0.1607034E+02 - 01 0.4625089E+01 0.6613872E+02 0.5272644E+02 0.2603859E+02 0.1614194E+02 - 01 0.4669234E+01 0.6607653E+02 0.5319277E+02 0.2623197E+02 0.1607799E+02 - 01 0.4713456E+01 0.6592516E+02 0.5365173E+02 0.2643186E+02 0.1592528E+02 - 01 0.4757875E+01 0.6578109E+02 0.5410229E+02 0.2663024E+02 0.1578120E+02 - 01 0.4802418E+01 0.6572029E+02 0.5454167E+02 0.2682630E+02 0.1572037E+02 - 01 0.4846871E+01 0.6579967E+02 0.5497009E+02 0.2702027E+02 0.1579971E+02 - 01 0.4891271E+01 0.6607938E+02 0.5538617E+02 0.2721150E+02 0.1607939E+02 - 01 0.4935558E+01 0.6650908E+02 0.5578433E+02 0.2739101E+02 0.1650908E+02 - 01 0.4979253E+01 0.6701344E+02 0.5616914E+02 0.2755927E+02 0.1701344E+02 - 01 0.5022748E+01 0.6748481E+02 0.5654073E+02 0.2771760E+02 0.1748481E+02 - 01 0.5065928E+01 0.6780848E+02 0.5690071E+02 0.2786974E+02 0.1780848E+02 - 01 0.5108871E+01 0.6796801E+02 0.5725117E+02 0.2801989E+02 0.1796801E+02 - 01 0.5151740E+01 0.6786764E+02 0.5759586E+02 0.2816993E+02 0.1786764E+02 - 01 0.5194658E+01 0.6766745E+02 0.5793604E+02 0.2832098E+02 0.1766745E+02 - 01 0.5237704E+01 0.6750588E+02 0.5827187E+02 0.2847360E+02 0.1750588E+02 - 01 0.5280924E+01 0.6741874E+02 0.5860340E+02 0.2862777E+02 0.1741874E+02 - 01 0.5324341E+01 0.6743687E+02 0.5893071E+02 0.2878324E+02 0.1743687E+02 - 01 0.5367957E+01 0.6755544E+02 0.5925382E+02 0.2893970E+02 0.1755544E+02 - 01 0.5411764E+01 0.6767605E+02 0.5957567E+02 0.2909691E+02 0.1767605E+02 - 01 0.5455738E+01 0.6776333E+02 0.5989419E+02 0.2925404E+02 0.1776333E+02 - 01 0.5499840E+01 0.6778744E+02 0.6020726E+02 0.2941084E+02 0.1778744E+02 - 01 0.5544011E+01 0.6774731E+02 0.6051422E+02 0.2956744E+02 0.1774731E+02 - 01 0.5588211E+01 0.6766881E+02 0.6081452E+02 0.2972361E+02 0.1766881E+02 - 01 0.5632414E+01 0.6756924E+02 0.6110762E+02 0.2987892E+02 0.1756924E+02 - 01 0.5676605E+01 0.6745038E+02 0.6139384E+02 0.3003296E+02 0.1745038E+02 - 01 0.5720776E+01 0.6733314E+02 0.6167373E+02 0.3018477E+02 0.1733314E+02 - 01 0.5764784E+01 0.6726862E+02 0.6194767E+02 0.3033336E+02 0.1726862E+02 - 01 0.5808620E+01 0.6724958E+02 0.6221644E+02 0.3047816E+02 0.1724958E+02 - 01 0.5852370E+01 0.6727348E+02 0.6248079E+02 0.3061876E+02 0.1727348E+02 - 01 0.5896137E+01 0.6734782E+02 0.6274128E+02 0.3075458E+02 0.1734782E+02 - 01 0.5940007E+01 0.6749214E+02 0.6299816E+02 0.3088460E+02 0.1749214E+02 - 01 0.5984039E+01 0.6773173E+02 0.6308957E+02 0.3092895E+02 0.1773173E+02 + 01 0.2652204E+01 0.6950825E+02 0.3171618E+02 0.2804686E+02 0.2013155E+02 + 01 0.2696745E+01 0.6895457E+02 0.3205996E+02 0.2788656E+02 0.1972162E+02 + 01 0.2744155E+01 0.6834212E+02 0.3241297E+02 0.2772186E+02 0.1922868E+02 + 01 0.2791419E+01 0.6764705E+02 0.3277683E+02 0.2755479E+02 0.1861620E+02 + 01 0.2838459E+01 0.6688928E+02 0.3315523E+02 0.2738629E+02 0.1790321E+02 + 01 0.2885439E+01 0.6604856E+02 0.3355110E+02 0.2721704E+02 0.1717295E+02 + 01 0.2932366E+01 0.6552519E+02 0.3396244E+02 0.2704718E+02 0.1682373E+02 + 01 0.2979300E+01 0.6588880E+02 0.3437741E+02 0.2687829E+02 0.1724170E+02 + 01 0.3026281E+01 0.6666205E+02 0.3478473E+02 0.2671244E+02 0.1813104E+02 + 01 0.3073286E+01 0.6703624E+02 0.3518722E+02 0.2654956E+02 0.1864139E+02 + 01 0.3120211E+01 0.6652280E+02 0.3559810E+02 0.2639082E+02 0.1829780E+02 + 01 0.3166885E+01 0.6582957E+02 0.3602301E+02 0.2623918E+02 0.1781316E+02 + 01 0.3213356E+01 0.6557122E+02 0.3645799E+02 0.2609809E+02 0.1772208E+02 + 01 0.3259597E+01 0.6563095E+02 0.3690150E+02 0.2597245E+02 0.1791138E+02 + 01 0.3305631E+01 0.6579854E+02 0.3735382E+02 0.2586331E+02 0.1818262E+02 + 01 0.3351494E+01 0.6585478E+02 0.3781539E+02 0.2576941E+02 0.1830008E+02 + 01 0.3397235E+01 0.6569103E+02 0.3827385E+02 0.2568687E+02 0.1818513E+02 + 01 0.3441664E+01 0.6535068E+02 0.3874197E+02 0.2560787E+02 0.1788230E+02 + 01 0.3486084E+01 0.6493239E+02 0.3921995E+02 0.2552925E+02 0.1748318E+02 + 01 0.3530557E+01 0.6462272E+02 0.3970684E+02 0.2544935E+02 0.1708066E+02 + 01 0.3575057E+01 0.6446047E+02 0.4019845E+02 0.2536746E+02 0.1671251E+02 + 01 0.3619285E+01 0.6439377E+02 0.4069406E+02 0.2528211E+02 0.1643478E+02 + 01 0.3663286E+01 0.6444477E+02 0.4119308E+02 0.2519331E+02 0.1626581E+02 + 01 0.3707172E+01 0.6453977E+02 0.4169293E+02 0.2510620E+02 0.1608283E+02 + 01 0.3750716E+01 0.6466194E+02 0.4219656E+02 0.2502472E+02 0.1587813E+02 + 01 0.3793942E+01 0.6476354E+02 0.4270641E+02 0.2494787E+02 0.1569980E+02 + 01 0.3837020E+01 0.6471808E+02 0.4322312E+02 0.2487433E+02 0.1549535E+02 + 01 0.3880047E+01 0.6456153E+02 0.4374667E+02 0.2480839E+02 0.1522237E+02 + 01 0.3923103E+01 0.6425215E+02 0.4427988E+02 0.2475628E+02 0.1479681E+02 + 01 0.3966312E+01 0.6385941E+02 0.4482471E+02 0.2471691E+02 0.1429523E+02 + 01 0.4009729E+01 0.6348361E+02 0.4537872E+02 0.2468885E+02 0.1381561E+02 + 01 0.4053141E+01 0.6326918E+02 0.4593483E+02 0.2467816E+02 0.1352763E+02 + 01 0.4096621E+01 0.6313262E+02 0.4649172E+02 0.2468799E+02 0.1333327E+02 + 01 0.4140200E+01 0.6301983E+02 0.4705220E+02 0.2471740E+02 0.1316475E+02 + 01 0.4183898E+01 0.6296200E+02 0.4761753E+02 0.2476497E+02 0.1305460E+02 + 01 0.4227735E+01 0.6315361E+02 0.4817426E+02 0.2483116E+02 0.1322672E+02 + 01 0.4271708E+01 0.6335014E+02 0.4872608E+02 0.2491782E+02 0.1340358E+02 + 01 0.4315792E+01 0.6354938E+02 0.4927620E+02 0.2502722E+02 0.1358229E+02 + 01 0.4359932E+01 0.6390504E+02 0.4981952E+02 0.2515599E+02 0.1392589E+02 + 01 0.4404067E+01 0.6442321E+02 0.5034914E+02 0.2530245E+02 0.1444256E+02 + 01 0.4448168E+01 0.6492727E+02 0.5086714E+02 0.2546802E+02 0.1494252E+02 + 01 0.4492242E+01 0.6534509E+02 0.5137692E+02 0.2565404E+02 0.1535310E+02 + 01 0.4536311E+01 0.6570790E+02 0.5187578E+02 0.2584800E+02 0.1571338E+02 + 01 0.4580398E+01 0.6594843E+02 0.5236112E+02 0.2604625E+02 0.1595319E+02 + 01 0.4624525E+01 0.6605365E+02 0.5283328E+02 0.2625169E+02 0.1605694E+02 + 01 0.4668713E+01 0.6604099E+02 0.5329334E+02 0.2646797E+02 0.1604210E+02 + 01 0.4712971E+01 0.6590954E+02 0.5374440E+02 0.2668792E+02 0.1590967E+02 + 01 0.4757309E+01 0.6578292E+02 0.5418613E+02 0.2690557E+02 0.1578303E+02 + 01 0.4801702E+01 0.6575300E+02 0.5461667E+02 0.2712026E+02 0.1575308E+02 + 01 0.4846054E+01 0.6589685E+02 0.5502972E+02 0.2733219E+02 0.1589695E+02 + 01 0.4890225E+01 0.6629634E+02 0.5542254E+02 0.2754019E+02 0.1629634E+02 + 01 0.4934125E+01 0.6671703E+02 0.5580174E+02 0.2773606E+02 0.1671703E+02 + 01 0.4977774E+01 0.6721296E+02 0.5616870E+02 0.2792001E+02 0.1721296E+02 + 01 0.5021233E+01 0.6764213E+02 0.5652340E+02 0.2809395E+02 0.1764213E+02 + 01 0.5064403E+01 0.6790911E+02 0.5686683E+02 0.2826176E+02 0.1790911E+02 + 01 0.5107311E+01 0.6801217E+02 0.5720078E+02 0.2842776E+02 0.1801217E+02 + 01 0.5150135E+01 0.6789100E+02 0.5752871E+02 0.2859399E+02 0.1789100E+02 + 01 0.5193003E+01 0.6766538E+02 0.5785268E+02 0.2876119E+02 0.1766538E+02 + 01 0.5235997E+01 0.6748743E+02 0.5817276E+02 0.2892966E+02 0.1748743E+02 + 01 0.5279164E+01 0.6740162E+02 0.5848900E+02 0.2909916E+02 0.1740162E+02 + 01 0.5322528E+01 0.6743169E+02 0.5879912E+02 0.2926809E+02 0.1743169E+02 + 01 0.5366098E+01 0.6755179E+02 0.5910200E+02 0.2943586E+02 0.1755179E+02 + 01 0.5409870E+01 0.6767842E+02 0.5939932E+02 0.2960325E+02 0.1767842E+02 + 01 0.5453824E+01 0.6772864E+02 0.5969298E+02 0.2977091E+02 0.1772864E+02 + 01 0.5497917E+01 0.6772875E+02 0.5998198E+02 0.2993893E+02 0.1772875E+02 + 01 0.5542095E+01 0.6767904E+02 0.6026545E+02 0.3010716E+02 0.1767904E+02 + 01 0.5586303E+01 0.6759462E+02 0.6054270E+02 0.3027527E+02 0.1759462E+02 + 01 0.5630494E+01 0.6749891E+02 0.6081317E+02 0.3044276E+02 0.1749891E+02 + 01 0.5674650E+01 0.6741443E+02 0.6107657E+02 0.3060905E+02 0.1741443E+02 + 01 0.5718773E+01 0.6734586E+02 0.6133277E+02 0.3077325E+02 0.1734586E+02 + 01 0.5762776E+01 0.6728106E+02 0.6158291E+02 0.3093491E+02 0.1728106E+02 + 01 0.5806600E+01 0.6727063E+02 0.6182798E+02 0.3109336E+02 0.1727063E+02 + 01 0.5850323E+01 0.6732194E+02 0.6206847E+02 0.3124644E+02 0.1732194E+02 + 01 0.5894040E+01 0.6744143E+02 0.6230466E+02 0.3139252E+02 0.1744143E+02 + 01 0.5937855E+01 0.6763519E+02 0.6253686E+02 0.3153086E+02 0.1763519E+02 + 01 0.5981839E+01 0.6788648E+02 0.6263071E+02 0.3158427E+02 0.1788648E+02 diff --git a/tests/particles/regression_test.py b/tests/particles/regression_test.py index 11d026ab8..ee1219c84 100644 --- a/tests/particles/regression_test.py +++ b/tests/particles/regression_test.py @@ -52,9 +52,9 @@ def runTest(self, save=False, indices=(2, 3)): import clawpack.pyclaw.gauges as gauges gauge = gauges.GaugeSolution(1, path=self.temp_path) - print('+++ Gauge 1:\n', gauge.q) + #print('+++ Gauge 1:\n', gauge.q) gauge = gauges.GaugeSolution(2, path=self.temp_path) - print('+++ Gauge 2:\n', gauge.q) + #print('+++ Gauge 2:\n', gauge.q) # Perform tests self.check_gauges(save=save, gauge_id=1, indices=(1, 2)) From aa2b2baeea6cafb61ce9b34d69c2b46791935cc5 Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Wed, 6 Sep 2023 16:22:24 -0700 Subject: [PATCH 6/6] remove unused import of wip in a regression_test --- tests/chile2010_adjoint/regression_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/chile2010_adjoint/regression_test.py b/tests/chile2010_adjoint/regression_test.py index 934c03466..77f457209 100644 --- a/tests/chile2010_adjoint/regression_test.py +++ b/tests/chile2010_adjoint/regression_test.py @@ -16,7 +16,6 @@ import clawpack.geoclaw.test as test import clawpack.geoclaw.topotools as topotools -from clawpack.clawutil.test import wip try: