Merge pull request #319 from NCAR/bug-fix-build

Bug fix build
NCAR · Oct 19, 2023 · 497f6dd · 497f6dd
2 parents de6b8e1 + ec20644
commit 497f6dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/include/micm/system/phase.hpp b/include/micm/system/phase.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <micm/system/species.hpp>
+#include <algorithm>
 #include <vector>
 
 namespace micm

diff --git a/test/integration/terminator.cpp b/test/integration/terminator.cpp
@@ -10,6 +10,9 @@
 #include <micm/util/sparse_matrix_vector_ordering.hpp>
 #include <micm/util/vector_matrix.hpp>
 
+template<class T>
+using SparseMatrixTest = micm::SparseMatrix<T>;
+
 template<template<class> class MatrixPolicy, template<class> class SparseMatrixPolicy, class LinearSolverPolicy>
 void RunTerminatorTest(std::size_t number_of_grid_cells)
 {
@@ -28,10 +31,10 @@ void RunTerminatorTest(std::size_t number_of_grid_cells)
 
 TEST(RosenbrockSolver, Terminator)
 {
-  RunTerminatorTest<micm::Matrix, micm::SparseMatrix, micm::LinearSolver<double, micm::SparseMatrix>>(2);
-  RunTerminatorTest<micm::Matrix, micm::SparseMatrix, micm::LinearSolver<double, micm::SparseMatrix>>(2);
-  RunTerminatorTest<micm::Matrix, micm::SparseMatrix, micm::LinearSolver<double, micm::SparseMatrix>>(3);
-  RunTerminatorTest<micm::Matrix, micm::SparseMatrix, micm::LinearSolver<double, micm::SparseMatrix>>(4);
+  RunTerminatorTest<micm::Matrix, SparseMatrixTest, micm::LinearSolver<double, SparseMatrixTest>>(2);
+  RunTerminatorTest<micm::Matrix, SparseMatrixTest, micm::LinearSolver<double, SparseMatrixTest>>(2);
+  RunTerminatorTest<micm::Matrix, SparseMatrixTest, micm::LinearSolver<double, SparseMatrixTest>>(3);
+  RunTerminatorTest<micm::Matrix, SparseMatrixTest, micm::LinearSolver<double, SparseMatrixTest>>(4);
 }
 
 template<class T>

diff --git a/test/integration/terminator.hpp b/test/integration/terminator.hpp
@@ -93,9 +93,9 @@ void TestTerminator(
       double cl_f = -l * (cl_i - det + r) * (cl_i + det + r) / (1.0 + e + dt * l * (cl_i + r));
       double cl2_f = -cl_f / 2.0;
       EXPECT_NEAR(
-          result.result_[i_cell][state.variable_map_["Cl"]], cl_i + dt * cl_f, (cl_i + dt * cl_f) * 1.0e-8 + 1.0e-15);
+          result.result_[i_cell][state.variable_map_["Cl"]], cl_i + dt * cl_f, (cl_i + dt * cl_f) * 1.0e-7 + 1.0e-14);
       EXPECT_NEAR(
-          result.result_[i_cell][state.variable_map_["Cl2"]], cl2_i + dt * cl2_f, (cl2_i + dt * cl2_f) * 1.0e-8 + 1.0e-15);
+          result.result_[i_cell][state.variable_map_["Cl2"]], cl2_i + dt * cl2_f, (cl2_i + dt * cl2_f) * 1.0e-7 + 1.0e-14);
     }
   }
 }