From 57a8ffaf5a3f25acbed096cde47ad5f1a010acae Mon Sep 17 00:00:00 2001 From: Qina Tan Date: Mon, 28 Aug 2023 18:11:29 -0600 Subject: [PATCH] clean up --- src/process/process_set.cu | 20 ++++++++++---------- test/unit/process/test_cuda_process_set.cpp | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/process/process_set.cu b/src/process/process_set.cu index 1ac6c7a6d..b54affef4 100644 --- a/src/process/process_set.cu +++ b/src/process/process_set.cu @@ -52,20 +52,20 @@ namespace micm for (std::size_t i_rxn = 0; i_rxn < n_reactions; ++i_rxn) { double rate = device->rate_constants[i_rxn * n_grids + tid]; - for (std::size_t i_react = 0; i_react < device->number_of_reactants_[i_rxn]; ++i_react) - rate *= device->state_variables[device->reactant_ids_[react_id_offset + i_react] * n_grids + tid]; - for (std::size_t i_react = 0; i_react < device->number_of_reactants_[i_rxn]; ++i_react) + for (std::size_t i_react = 0; i_react < device->number_of_reactants[i_rxn]; ++i_react) + rate *= device->state_variables[device->reactant_ids[react_id_offset + i_react] * n_grids + tid]; + for (std::size_t i_react = 0; i_react < device->number_of_reactants[i_rxn]; ++i_react) { - device->forcing[device->reactant_ids_[react_id_offset + i_react] * n_grids + tid] -= rate; + device->forcing[device->reactant_ids[react_id_offset + i_react] * n_grids + tid] -= rate; } - for (std::size_t i_prod = 0; i_prod < device->number_of_products_[i_rxn]; ++i_prod) + for (std::size_t i_prod = 0; i_prod < device->number_of_products[i_rxn]; ++i_prod) { - size_t index = product_ids_[prod_id_offset + i_prod] * n_grids + tid; - device->forcing[index] += yields_[yield_offset + i_prod] * rate; + size_t index = device->product_ids[prod_id_offset + i_prod] * n_grids + tid; + device->forcing[index] += device->yields[yield_offset + i_prod] * rate; } - react_id_offset += device->number_of_reactants_[i_rxn]; - prod_id_offset += device->number_of_products_[i_rxn]; - yield_offset += device->number_of_products_[i_rxn]; + react_id_offset += device->number_of_reactants[i_rxn]; + prod_id_offset += device->number_of_products[i_rxn]; + yield_offset += device->number_of_products[i_rxn]; } // for loop over number of reactions } // if check for valid CUDA threads } // end of AddForcingTerms_kernel diff --git a/test/unit/process/test_cuda_process_set.cpp b/test/unit/process/test_cuda_process_set.cpp index 63a66de26..13fcffbf1 100644 --- a/test/unit/process/test_cuda_process_set.cpp +++ b/test/unit/process/test_cuda_process_set.cpp @@ -168,14 +168,14 @@ void testRandomSystemAddJacobianTerms(std::size_t n_cells, std::size_t n_reactio } template -using Group10000VectorMatrix = micm::VectorMatrix; +using Group10000VectorMatrix = micm::VectorMatrix; template -using Group10000SparseVectorMatrix = micm::SparseMatrix>; +using Group10000SparseVectorMatrix = micm::SparseMatrix>; TEST(RandomCudaProcessSet, Forcing) { - testRandomSystemAddForcingTerms(5, 8, 6); + testRandomSystemAddForcingTerms(10000, 500, 400); } TEST(RandomCudaProcessSet, Jacobian) {