diff --git a/free_boundary/laplace_solver/BUILD.bazel b/free_boundary/laplace_solver/BUILD.bazel index 433ea4c..2948d5f 100644 --- a/free_boundary/laplace_solver/BUILD.bazel +++ b/free_boundary/laplace_solver/BUILD.bazel @@ -5,7 +5,9 @@ cc_test( name = "laplace_solver_test", srcs = ["laplace_solver_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/laplace_solver/laplace_solver_test.cc b/free_boundary/laplace_solver/laplace_solver_test.cc index d2149bf..5311889 100644 --- a/free_boundary/laplace_solver/laplace_solver_test.cc +++ b/free_boundary/laplace_solver/laplace_solver_test.cc @@ -150,10 +150,14 @@ TEST_P(FourPTest, CheckFourP) { } } // CheckFourP -INSTANTIATE_TEST_SUITE_P(TestLaplaceSolver, FourPTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-9, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestLaplaceSolver, FourPTest, + 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}})); class FourISymmTest : public TestWithParam { protected: @@ -227,10 +231,14 @@ TEST_P(FourISymmTest, CheckFourISymm) { } } // CheckFourISymm -INSTANTIATE_TEST_SUITE_P(TestLaplaceSolver, FourISymmTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-9, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestLaplaceSolver, FourISymmTest, + 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}})); class FourIAccumulateGrpmnTest : public TestWithParam { protected: @@ -322,10 +330,14 @@ TEST_P(FourIAccumulateGrpmnTest, CheckFourIAccumulateGrpmn) { } } // CheckFourIAccumulateGrpmn -INSTANTIATE_TEST_SUITE_P(TestLaplaceSolver, FourIAccumulateGrpmnTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-9, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestLaplaceSolver, FourIAccumulateGrpmnTest, + 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}})); class FourIKvDftTest : public TestWithParam { protected: @@ -470,10 +482,14 @@ TEST_P(FourIKvDftTest, CheckFourIKvDft) { } } // CheckFourIKvDft -INSTANTIATE_TEST_SUITE_P(TestLaplaceSolver, FourIKvDftTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-9, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestLaplaceSolver, FourIKvDftTest, + 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}})); class FourIKuDftTest : public TestWithParam { protected: @@ -582,10 +598,14 @@ TEST_P(FourIKuDftTest, CheckFourIKuDft) { } } // CheckFourIKuDft -INSTANTIATE_TEST_SUITE_P(TestLaplaceSolver, FourIKuDftTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-9, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestLaplaceSolver, FourIKuDftTest, + 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}})); class SolverInputsTest : public TestWithParam { protected: @@ -682,10 +702,14 @@ TEST_P(SolverInputsTest, CheckSolverInputs) { } } // CheckSolverInputs -INSTANTIATE_TEST_SUITE_P(TestLaplaceSolver, SolverInputsTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-9, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestLaplaceSolver, SolverInputsTest, + 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}})); class LinearSolverTest : public TestWithParam { protected: @@ -739,9 +763,13 @@ TEST_P(LinearSolverTest, CheckLinearSolver) { } } // CheckLinearSolver -INSTANTIATE_TEST_SUITE_P(TestLaplaceSolver, LinearSolverTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-9, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestLaplaceSolver, LinearSolverTest, + 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 diff --git a/free_boundary/nestor/nestor_test.cc b/free_boundary/nestor/nestor_test.cc index aeab66d..542ba60 100644 --- a/free_boundary/nestor/nestor_test.cc +++ b/free_boundary/nestor/nestor_test.cc @@ -220,9 +220,13 @@ TEST_P(BsqVacTest, CheckBsqVac) { } } // CheckBsqVac -INSTANTIATE_TEST_SUITE_P(TestNestor, BsqVacTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-10, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestNestor, BsqVacTest, + Values(DataSource{.identifier = "solovev_free_bdy", + .tolerance = 1.0e-10, + .iter2_to_test = {3}}, + DataSource{.identifier = "cth_like_free_bdy", + .tolerance = 1.0e-10, + .iter2_to_test = {53, 54}})); } // namespace vmecpp diff --git a/vmec/ideal_mhd_model/ideal_mhd_model_test.cc b/vmec/ideal_mhd_model/ideal_mhd_model_test.cc index d7c509f..6a8c15b 100644 --- a/vmec/ideal_mhd_model/ideal_mhd_model_test.cc +++ b/vmec/ideal_mhd_model/ideal_mhd_model_test.cc @@ -1508,10 +1508,14 @@ TEST_P(RBsqTest, CheckRBsq) { } } // CheckRBsq -INSTANTIATE_TEST_SUITE_P(TestIdealMHDModel, RBsqTest, - Values(DataSource{.identifier = "cth_like_free_bdy", - .tolerance = 1.0e-10, - .iter2_to_test = {53, 54}})); +INSTANTIATE_TEST_SUITE_P( + TestIdealMHDModel, RBsqTest, + Values(DataSource{.identifier = "solovev_free_bdy", + .tolerance = 1.0e-10, + .iter2_to_test = {3}}, + DataSource{.identifier = "cth_like_free_bdy", + .tolerance = 1.0e-10, + .iter2_to_test = {53, 54}})); class AliasTest : public TestWithParam { protected: diff --git a/vmec/output_quantities/BUILD.bazel b/vmec/output_quantities/BUILD.bazel index 5ae14c9..e9d193f 100644 --- a/vmec/output_quantities/BUILD.bazel +++ b/vmec/output_quantities/BUILD.bazel @@ -7,12 +7,14 @@ cc_test( data = [ "//vmecpp/test_data:solovev", "//vmecpp/test_data:solovev_no_axis", + "//vmecpp/test_data:solovev_free_bdy", "//vmecpp/test_data:cth_like_fixed_bdy", "//vmecpp/test_data:cth_like_fixed_bdy_nzeta_37", "//vmecpp/test_data:cma", "//vmecpp/test_data:cth_like_free_bdy", "//vmecpp_large_cpp_tests/test_data:solovev", "//vmecpp_large_cpp_tests/test_data:solovev_no_axis", + "//vmecpp_large_cpp_tests/test_data:solovev_free_bdy", "//vmecpp_large_cpp_tests/test_data:cth_like_fixed_bdy", "//vmecpp_large_cpp_tests/test_data:cth_like_fixed_bdy_nzeta_37", "//vmecpp_large_cpp_tests/test_data:cma", diff --git a/vmec/output_quantities/output_quantities_test.cc b/vmec/output_quantities/output_quantities_test.cc index c8361d6..45d407f 100644 --- a/vmec/output_quantities/output_quantities_test.cc +++ b/vmec/output_quantities/output_quantities_test.cc @@ -164,6 +164,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, GatherDataFromThreadsTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-12}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-12}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-6}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 1.0e-12}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 1.0e-12}, @@ -256,6 +257,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, BSSRoutineOutputsTest, Values(DataSource{.identifier = "solovev", .tolerance = 5.0e-11}, DataSource{.identifier = "solovev_no_axis", .tolerance = 5.0e-11}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 5.0e-5}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 5.0e-13}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 5.0e-13}, @@ -350,6 +352,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, LowpassFilterBSubsSTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-12}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-12}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-6}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 1.0e-12}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 1.0e-12}, @@ -411,6 +414,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, ExtrapolateBSubsSTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-12}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-12}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-6}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 2.0e-14}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 5.0e-15}, @@ -541,6 +545,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, JxBOutputContentsTest, Values(DataSource{.identifier = "solovev", .tolerance = 2.0e-5}, DataSource{.identifier = "solovev_no_axis", .tolerance = 2.0e-5}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-1}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 1.0e-5}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 1.0e-5}, @@ -673,6 +678,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, MercierStabilityTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-9}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-9}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-4}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 1.0e-9}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 1.0e-9}, @@ -801,6 +807,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, Threed1FirstTableTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-9}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-9}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 5.0e-3}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 1.0e-8}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 1.0e-8}, @@ -1024,6 +1031,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, Threed1GeometricMagneticQuantitiesTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-5}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-5}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-2}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 5.0e-9}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 5.0e-9}, @@ -1101,6 +1109,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, Threed1VolumetricsTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-12}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-12}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-5}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 1.0e-12}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 1.0e-12}, @@ -1165,6 +1174,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, Threed1AxisTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-12}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-12}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-5}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 1.0e-12}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 1.0e-12}, @@ -1228,6 +1238,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, Threed1BetasTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-12}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-12}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 1.0e-6}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 1.0e-12}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 1.0e-12}, @@ -1310,6 +1321,7 @@ INSTANTIATE_TEST_SUITE_P( TestOutputQuantities, Threed1ShafranovIntegralsTest, Values(DataSource{.identifier = "solovev", .tolerance = 1.0e-11}, DataSource{.identifier = "solovev_no_axis", .tolerance = 1.0e-11}, + DataSource{.identifier = "solovev_free_bdy", .tolerance = 5.0e-4}, DataSource{.identifier = "cth_like_fixed_bdy", .tolerance = 5.0e-11}, DataSource{.identifier = "cth_like_fixed_bdy_nzeta_37", .tolerance = 5.0e-11},