From 171211be5e68b9e47e1ca3da4a391e57383884f8 Mon Sep 17 00:00:00 2001 From: Jonathan Schilling Date: Mon, 30 Mar 2026 18:32:16 +0200 Subject: [PATCH] axisymm tests for regint and singint --- .../regularized_integrals/BUILD.bazel | 2 ++ .../regularized_integrals_test.cc | 24 ++++++++++++------- free_boundary/singular_integrals/BUILD.bazel | 2 ++ .../singular_integrals_test.cc | 24 ++++++++++++------- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/free_boundary/regularized_integrals/BUILD.bazel b/free_boundary/regularized_integrals/BUILD.bazel index 7e66a7d..87dbde1 100644 --- a/free_boundary/regularized_integrals/BUILD.bazel +++ b/free_boundary/regularized_integrals/BUILD.bazel @@ -5,7 +5,9 @@ cc_test( name = "regularized_integrals_test", srcs = ["regularized_integrals_test.cc"], data = [ + "//vmecpp/test_data:solovev_free_bdy", "//vmecpp/test_data:cth_like_free_bdy", + "//vmecpp_large_cpp_tests/test_data:solovev_free_bdy", "//vmecpp_large_cpp_tests/test_data:cth_like_free_bdy", ], deps = [ diff --git a/free_boundary/regularized_integrals/regularized_integrals_test.cc b/free_boundary/regularized_integrals/regularized_integrals_test.cc index 0c413ab..37b6d6b 100644 --- a/free_boundary/regularized_integrals/regularized_integrals_test.cc +++ b/free_boundary/regularized_integrals/regularized_integrals_test.cc @@ -88,10 +88,14 @@ TEST_P(TanuTanvTest, CheckTanuTanv) { } } // CheckTanuTanv -INSTANTIATE_TEST_SUITE_P(TestRegularizedIntegrals, TanuTanvTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-14, - .iter2_to_test = {53}})); +INSTANTIATE_TEST_SUITE_P( + TestRegularizedIntegrals, TanuTanvTest, + Values(DataSource{.identifier = "solovev_free_bdy", + .tolerance = 1.0e-14, + .iter2_to_test = {3}}, + DataSource{.identifier = "cth_like_free_bdy", + .tolerance = 1.0e-14, + .iter2_to_test = {53}})); class GreenFTest : public TestWithParam { protected: @@ -187,9 +191,13 @@ TEST_P(GreenFTest, CheckGreenF) { } } // CheckGreenF -INSTANTIATE_TEST_SUITE_P(TestRegularizedIntegrals, GreenFTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 5.0e-10, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestRegularizedIntegrals, GreenFTest, + Values(DataSource{.identifier = "solovev_free_bdy", + .tolerance = 5.0e-10, + .iter2_to_test = {3}}, + DataSource{.identifier = "cth_like_free_bdy", + .tolerance = 5.0e-10, + .iter2_to_test = {53, 54}})); } // namespace vmecpp diff --git a/free_boundary/singular_integrals/BUILD.bazel b/free_boundary/singular_integrals/BUILD.bazel index 5bd5ec5..64477e1 100644 --- a/free_boundary/singular_integrals/BUILD.bazel +++ b/free_boundary/singular_integrals/BUILD.bazel @@ -5,7 +5,9 @@ cc_test( name = "singular_integrals_test", srcs = ["singular_integrals_test.cc"], data = [ + "//vmecpp/test_data:solovev_free_bdy", "//vmecpp/test_data:cth_like_free_bdy", + "//vmecpp_large_cpp_tests/test_data:solovev_free_bdy", "//vmecpp_large_cpp_tests/test_data:cth_like_free_bdy", ], deps = [ diff --git a/free_boundary/singular_integrals/singular_integrals_test.cc b/free_boundary/singular_integrals/singular_integrals_test.cc index d96b460..f555b2a 100644 --- a/free_boundary/singular_integrals/singular_integrals_test.cc +++ b/free_boundary/singular_integrals/singular_integrals_test.cc @@ -98,10 +98,14 @@ TEST_P(CmnsTest, CheckCmns) { } } // CheckCmns -INSTANTIATE_TEST_SUITE_P(TestSingularIntegrals, CmnsTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-14, - .iter2_to_test = {53}})); +INSTANTIATE_TEST_SUITE_P( + TestSingularIntegrals, CmnsTest, + Values(DataSource{.identifier = "solovev_free_bdy", + .tolerance = 1.0e-14, + .iter2_to_test = {3}}, + DataSource{.identifier = "cth_like_free_bdy", + .tolerance = 1.0e-14, + .iter2_to_test = {53}})); class AnalytTest : public TestWithParam { protected: @@ -247,9 +251,13 @@ TEST_P(AnalytTest, CheckAnalyt) { } } // CheckAnalyt -INSTANTIATE_TEST_SUITE_P(TestSingularIntegrals, AnalytTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-9, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestSingularIntegrals, AnalytTest, + Values(DataSource{.identifier = "solovev_free_bdy", + .tolerance = 1.0e-9, + .iter2_to_test = {3}}, + DataSource{.identifier = "cth_like_free_bdy", + .tolerance = 1.0e-9, + .iter2_to_test = {53, 54}})); } // namespace vmecpp