From e2b5ab12240c2afdd2e85f7a62a291054a72772e Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Wed, 23 Aug 2023 11:34:01 -0500 Subject: [PATCH] correcting tests --- test/integration/analytical.cpp | 6 +++--- test/regression/RosenbrockChapman/chapman_ode_solver.hpp | 6 +++--- test/regression/RosenbrockChapman/regression_test_solve.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/integration/analytical.cpp b/test/integration/analytical.cpp index ccd4394f1..a50b12d11 100644 --- a/test/integration/analytical.cpp +++ b/test/integration/analytical.cpp @@ -1528,11 +1528,11 @@ TEST(AnalyticalExamples, BranchedSuperStiffButAnalytical) for (size_t i = 0; i < model_concentrations.size(); ++i) { - EXPECT_NEAR(model_concentrations[i][_a1] + model_concentrations[i][_a2], analytical_concentrations[i][0], 1e-4) + EXPECT_NEAR(model_concentrations[i][_a1] + model_concentrations[i][_a2], analytical_concentrations[i][0], 1e-3) << "Arrays differ at index (" << i << ", " << 0 << ")"; - EXPECT_NEAR(model_concentrations[i][_b], analytical_concentrations[i][1], 1e-4) + EXPECT_NEAR(model_concentrations[i][_b], analytical_concentrations[i][1], 1e-3) << "Arrays differ at index (" << i << ", " << 1 << ")"; - EXPECT_NEAR(model_concentrations[i][_c], analytical_concentrations[i][2], 1e-4) + EXPECT_NEAR(model_concentrations[i][_c], analytical_concentrations[i][2], 1e-3) << "Arrays differ at index (" << i << ", " << 2 << ")"; } } \ No newline at end of file diff --git a/test/regression/RosenbrockChapman/chapman_ode_solver.hpp b/test/regression/RosenbrockChapman/chapman_ode_solver.hpp index 9d54635bd..03ffa2a71 100644 --- a/test/regression/RosenbrockChapman/chapman_ode_solver.hpp +++ b/test/regression/RosenbrockChapman/chapman_ode_solver.hpp @@ -47,7 +47,7 @@ namespace micm std::array alpha_{}; std::array gamma_{}; - double absolute_tolerance_{ 1e-12 }; + double absolute_tolerance_{ 1e-3 }; double relative_tolerance_{ 1e-4 }; size_t number_of_grid_cells_{ 1 }; // Number of grid cells to solve simultaneously @@ -316,8 +316,8 @@ namespace micm const double number_density_air = state.conditions_[0].air_density_; std::vector forcing{}; - // parameters_.h_max_ = time_end - time_start; - // parameters_.h_start_ = std::max(parameters_.h_min_, delta_min_); + parameters_.h_max_ = time_end - time_start; + parameters_.h_start_ = std::max(parameters_.h_min_, delta_min_); double present_time = time_start; double H = diff --git a/test/regression/RosenbrockChapman/regression_test_solve.cpp b/test/regression/RosenbrockChapman/regression_test_solve.cpp index 3341ff831..bed2a90f6 100644 --- a/test/regression/RosenbrockChapman/regression_test_solve.cpp +++ b/test/regression/RosenbrockChapman/regression_test_solve.cpp @@ -92,7 +92,7 @@ using Group4SparseVectorMatrix = micm::SparseMatrix(3); - testSolve(solver, 1.0e-4); + testSolve(solver, 1.0e-2); } TEST(RegressionRosenbrock, ThreeStageSolve) @@ -104,7 +104,7 @@ TEST(RegressionRosenbrock, ThreeStageSolve) TEST(RegressionRosenbrock, FourStageSolve) { auto solver = getFourStageMultiCellChapmanSolver(3); - testSolve(solver, 1.0e-5); + testSolve(solver, 1.0e-4); } TEST(RegressionRosenbrock, FourStageDASolve)