fix cuda tests

NCAR · Oct 2, 2024 · f4cf73a · f4cf73a
1 parent 0904e97
commit f4cf73a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/include/micm/cuda/solver/cuda_rosenbrock.hpp b/include/micm/cuda/solver/cuda_rosenbrock.hpp
@@ -116,7 +116,7 @@ namespace micm
     /// @return The scaled norm of the errors
     template<class DenseMatrixPolicy>
     double NormalizedError(const DenseMatrixPolicy& y_old, const DenseMatrixPolicy& y_new, const DenseMatrixPolicy& errors)
-        const requires(CudaMatrix<DenseMatrixPolicy>&& VectorizableDense<DenseMatrixPolicy>)
+        const requires(CudaMatrix<DenseMatrixPolicy>&& VectorizableDense<DenseMatrixPolicy>, auto& state)
     {
       return micm::cuda::NormalizedErrorDriver(
           y_old.AsDeviceParam(), y_new.AsDeviceParam(), errors.AsDeviceParam(), this->parameters_, this->devstruct_);

diff --git a/test/integration/cuda/test_cuda_analytical_rosenbrock.cpp b/test/integration/cuda/test_cuda_analytical_rosenbrock.cpp
@@ -146,8 +146,6 @@ TEST(AnalyticalExamplesCudaRosenbrock, Robertson)
 {
   auto rosenbrock_solver = [](auto params)
   {
-    params.relative_tolerance_ = 1e-10;
-    params.absolute_tolerance_ = std::vector<double>(3, params.relative_tolerance_ * 1e-2);
     return builderType1Cell(params);
   };
 

diff --git a/test/unit/cuda/solver/test_cuda_rosenbrock.cpp b/test/unit/cuda/solver/test_cuda_rosenbrock.cpp
@@ -133,7 +133,7 @@ void testNormalizedErrorConst()
   y_new.CopyToDevice();
   errors.CopyToDevice();
 
-  double error = gpu_solver.solver_.NormalizedError(y_old, y_new, errors);
+  double error = gpu_solver.solver_.NormalizedError(y_old, y_new, errors, state);
 
   auto expected_error = 0.0;
   for (size_t i = 0; i < state.state_size_; ++i)
@@ -192,7 +192,7 @@ void testNormalizedErrorDiff()
   y_new.CopyToDevice();
   errors.CopyToDevice();
 
-  double computed_error = gpu_solver.solver_.NormalizedError(y_old, y_new, errors);
+  double computed_error = gpu_solver.solver_.NormalizedError(y_old, y_new, errors, state);
 
   auto relative_error =
       std::abs(computed_error - expected_error) / std::max(std::abs(computed_error), std::abs(expected_error));