From 125ec5e9b9d466a2d261558eae991ba9b2b4a035 Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Fri, 27 Sep 2024 12:39:49 -0500 Subject: [PATCH] jit tolerances --- .../jit/test_jit_analytical_rosenbrock.cpp | 91 +++++++++---------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/test/integration/jit/test_jit_analytical_rosenbrock.cpp b/test/integration/jit/test_jit_analytical_rosenbrock.cpp index e9e91ac04..7307e68e1 100644 --- a/test/integration/jit/test_jit_analytical_rosenbrock.cpp +++ b/test/integration/jit/test_jit_analytical_rosenbrock.cpp @@ -28,7 +28,7 @@ auto param_six_da = micm::RosenbrockSolverParameters::SixStageDifferentialAlgebr TEST(AnalyticalExamplesJitRosenbrock, Troe) { - test_analytical_troe, StateType>(BuilderType(param_two), 1e-3); + test_analytical_troe, StateType>(BuilderType(param_two)); test_analytical_troe, StateType>(BuilderType(param_three)); test_analytical_troe, StateType>(BuilderType(param_four)); test_analytical_troe, StateType>(BuilderType(param_four_da)); @@ -37,7 +37,7 @@ TEST(AnalyticalExamplesJitRosenbrock, Troe) TEST(AnalyticalExamplesJitRosenbrock, TroeSuperStiffButAnalytical) { - test_analytical_stiff_troe, StateType>(BuilderType(param_two), 1e-3); + test_analytical_stiff_troe, StateType>(BuilderType(param_two)); test_analytical_stiff_troe, StateType>(BuilderType(param_three)); test_analytical_stiff_troe, StateType>(BuilderType(param_four)); test_analytical_stiff_troe, StateType>(BuilderType(param_four_da)); @@ -46,27 +46,26 @@ TEST(AnalyticalExamplesJitRosenbrock, TroeSuperStiffButAnalytical) TEST(AnalyticalExamplesJitRosenbrock, Photolysis) { - test_analytical_photolysis, StateType>(BuilderType(param_two), 1e-2); - test_analytical_photolysis, StateType>(BuilderType(param_three), 1e-4); - test_analytical_photolysis, StateType>(BuilderType(param_four), 1e-5); - test_analytical_photolysis, StateType>(BuilderType(param_four_da), 1e-5); - test_analytical_photolysis, StateType>(BuilderType(param_six_da), 1e-5); + test_analytical_photolysis, StateType>(BuilderType(param_two)); + test_analytical_photolysis, StateType>(BuilderType(param_three)); + test_analytical_photolysis, StateType>(BuilderType(param_four)); + test_analytical_photolysis, StateType>(BuilderType(param_four_da)); + test_analytical_photolysis, StateType>(BuilderType(param_six_da)); } TEST(AnalyticalExamplesJitRosenbrock, PhotolysisSuperStiffButAnalytical) { - test_analytical_stiff_photolysis, StateType>(BuilderType(param_two), 1e-2); - test_analytical_stiff_photolysis, StateType>(BuilderType(param_three), 1e-3); - test_analytical_stiff_photolysis, StateType>(BuilderType(param_four), 1e-3); - test_analytical_stiff_photolysis, StateType>( - BuilderType(param_four_da), 1e-3); - test_analytical_stiff_photolysis, StateType>(BuilderType(param_six_da), 1e-3); + test_analytical_stiff_photolysis, StateType>(BuilderType(param_two)); + test_analytical_stiff_photolysis, StateType>(BuilderType(param_three)); + test_analytical_stiff_photolysis, StateType>(BuilderType(param_four)); + test_analytical_stiff_photolysis, StateType>(BuilderType(param_four_da)); + test_analytical_stiff_photolysis, StateType>(BuilderType(param_six_da)); } TEST(AnalyticalExamplesJitRosenbrock, TernaryChemicalActivation) { test_analytical_ternary_chemical_activation, StateType>( - BuilderType(param_two), 1e-3); + BuilderType(param_two)); test_analytical_ternary_chemical_activation, StateType>( BuilderType(param_three)); test_analytical_ternary_chemical_activation, StateType>( @@ -93,16 +92,16 @@ TEST(AnalyticalExamplesJitRosenbrock, TernaryChemicalActivationSuperStiffButAnal TEST(AnalyticalExamplesJitRosenbrock, Tunneling) { - test_analytical_tunneling, StateType>(BuilderType(param_two), 1e-1); - test_analytical_tunneling, StateType>(BuilderType(param_three), 1e-5); + test_analytical_tunneling, StateType>(BuilderType(param_two), 2e-5); + test_analytical_tunneling, StateType>(BuilderType(param_three)); test_analytical_tunneling, StateType>(BuilderType(param_four)); - test_analytical_tunneling, StateType>(BuilderType(param_four_da), 1e-5); + test_analytical_tunneling, StateType>(BuilderType(param_four_da)); test_analytical_tunneling, StateType>(BuilderType(param_six_da)); } TEST(AnalyticalExamplesJitRosenbrock, TunnelingSuperStiffButAnalytical) { - test_analytical_stiff_tunneling, StateType>(BuilderType(param_two), 1e-1); + test_analytical_stiff_tunneling, StateType>(BuilderType(param_two), 1e-4); test_analytical_stiff_tunneling, StateType>(BuilderType(param_three), 1e-4); test_analytical_stiff_tunneling, StateType>(BuilderType(param_four), 1e-4); test_analytical_stiff_tunneling, StateType>(BuilderType(param_four_da), 1e-4); @@ -111,7 +110,7 @@ TEST(AnalyticalExamplesJitRosenbrock, TunnelingSuperStiffButAnalytical) TEST(AnalyticalExamplesJitRosenbrock, Arrhenius) { - test_analytical_arrhenius, StateType>(BuilderType(param_two), 1e-3); + test_analytical_arrhenius, StateType>(BuilderType(param_two), 4e-6); test_analytical_arrhenius, StateType>(BuilderType(param_three)); test_analytical_arrhenius, StateType>(BuilderType(param_four)); test_analytical_arrhenius, StateType>(BuilderType(param_four_da)); @@ -120,16 +119,16 @@ TEST(AnalyticalExamplesJitRosenbrock, Arrhenius) TEST(AnalyticalExamplesJitRosenbrock, ArrheniusSuperStiffButAnalytical) { - test_analytical_stiff_arrhenius, StateType>(BuilderType(param_two), 1e-1); - test_analytical_stiff_arrhenius, StateType>(BuilderType(param_three), 1e-3); - test_analytical_stiff_arrhenius, StateType>(BuilderType(param_four), 1e-4); - test_analytical_stiff_arrhenius, StateType>(BuilderType(param_four_da), 1e-4); - test_analytical_stiff_arrhenius, StateType>(BuilderType(param_six_da), 1e-3); + test_analytical_stiff_arrhenius, StateType>(BuilderType(param_two), 1e-4); + test_analytical_stiff_arrhenius, StateType>(BuilderType(param_three), 2e-5); + test_analytical_stiff_arrhenius, StateType>(BuilderType(param_four), 2e-5); + test_analytical_stiff_arrhenius, StateType>(BuilderType(param_four_da), 2e-5); + test_analytical_stiff_arrhenius, StateType>(BuilderType(param_six_da), 1e-5); } TEST(AnalyticalExamplesJitRosenbrock, Branched) { - test_analytical_branched, StateType>(BuilderType(param_two), 1e-3); + test_analytical_branched, StateType>(BuilderType(param_two), 1e-10); test_analytical_branched, StateType>(BuilderType(param_three)); test_analytical_branched, StateType>(BuilderType(param_four)); test_analytical_branched, StateType>(BuilderType(param_four_da)); @@ -155,28 +154,28 @@ TEST(AnalyticalExamplesJitRosenbrock, Robertson) }; auto solver = rosenbrock_solver(micm::RosenbrockSolverParameters::TwoStageRosenbrockParameters()); - test_analytical_robertson, StateType<1>>(solver, 2e-1); + test_analytical_robertson, StateType<1>>(solver, 1e-1); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::ThreeStageRosenbrockParameters()); - test_analytical_robertson, StateType<1>>(solver, 2e-1); + test_analytical_robertson, StateType<1>>(solver, 1e-1); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::FourStageRosenbrockParameters()); - test_analytical_robertson, StateType<1>>(solver, 2e-1); + test_analytical_robertson, StateType<1>>(solver, 1e-1); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::FourStageDifferentialAlgebraicRosenbrockParameters()); - test_analytical_robertson, StateType<1>>(solver, 2e-1); + test_analytical_robertson, StateType<1>>(solver, 1e-1); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::SixStageDifferentialAlgebraicRosenbrockParameters()); - test_analytical_robertson, StateType<1>>(solver, 2e-1); + test_analytical_robertson, StateType<1>>(solver, 1e-1); } TEST(AnalyticalExamplesJitRosenbrock, SurfaceRxn) { test_analytical_surface_rxn, StateType<1>>(two, 1e-4); - test_analytical_surface_rxn, StateType<1>>(three, 1e-4); - test_analytical_surface_rxn, StateType<1>>(four, 1e-4); - test_analytical_surface_rxn, StateType<1>>(four_da, 1e-4); - test_analytical_surface_rxn, StateType<1>>(six_da, 1e-4); + test_analytical_surface_rxn, StateType<1>>(three, 1e-5); + test_analytical_surface_rxn, StateType<1>>(four, 1e-5); + test_analytical_surface_rxn, StateType<1>>(four_da, 1e-5); + test_analytical_surface_rxn, StateType<1>>(six_da, 1e-5); } TEST(AnalyticalExamplesJitRosenbrock, E5) @@ -210,7 +209,7 @@ TEST(AnalyticalExamplesJitRosenbrock, E5) test_analytical_e5, StateType<1>>(solver, 1e-3); } -TEST(AnalyticalExamples, Oregonator) +TEST(AnalyticalExamplesJitRosenbrock, Oregonator) { auto rosenbrock_solver = [](auto params) { @@ -221,22 +220,22 @@ TEST(AnalyticalExamples, Oregonator) }; auto solver = rosenbrock_solver(micm::RosenbrockSolverParameters::TwoStageRosenbrockParameters()); - test_analytical_oregonator, StateType<1>>(solver, 1e-3); + test_analytical_oregonator, StateType<1>>(solver, 4e-4); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::ThreeStageRosenbrockParameters()); - test_analytical_oregonator, StateType<1>>(solver, 1e-3); + test_analytical_oregonator, StateType<1>>(solver, 4e-4); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::FourStageRosenbrockParameters()); - test_analytical_oregonator, StateType<1>>(solver, 1e-3); + test_analytical_oregonator, StateType<1>>(solver, 4e-4); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::FourStageDifferentialAlgebraicRosenbrockParameters()); - test_analytical_oregonator, StateType<1>>(solver, 1e-3); + test_analytical_oregonator, StateType<1>>(solver, 4e-4); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::SixStageDifferentialAlgebraicRosenbrockParameters()); - test_analytical_oregonator, StateType<1>>(solver, 1e-3); + test_analytical_oregonator, StateType<1>>(solver, 4e-4); } -TEST(AnalyticalExamples, HIRES) +TEST(AnalyticalExamplesJitRosenbrock, HIRES) { auto rosenbrock_solver = [](auto params) { @@ -246,17 +245,17 @@ TEST(AnalyticalExamples, HIRES) }; auto solver = rosenbrock_solver(micm::RosenbrockSolverParameters::TwoStageRosenbrockParameters()); - test_analytical_hires, StateType<1>>(solver, 5e-2); + test_analytical_hires, StateType<1>>(solver, 1e-6); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::ThreeStageRosenbrockParameters()); - test_analytical_hires, StateType<1>>(solver, 1e-3); + test_analytical_hires, StateType<1>>(solver, 1e-7); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::FourStageRosenbrockParameters()); - test_analytical_hires, StateType<1>>(solver, 1e-3); + test_analytical_hires, StateType<1>>(solver, 1e-7); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::FourStageDifferentialAlgebraicRosenbrockParameters()); - test_analytical_hires, StateType<1>>(solver, 1e-3); + test_analytical_hires, StateType<1>>(solver, 1e-6); solver = rosenbrock_solver(micm::RosenbrockSolverParameters::SixStageDifferentialAlgebraicRosenbrockParameters()); - test_analytical_hires, StateType<1>>(solver, 1e-3); + test_analytical_hires, StateType<1>>(solver, 1e-6); } \ No newline at end of file