clean up

NCAR · Aug 26, 2023 · 1f5489d · 1f5489d
1 parent bcc9b85
commit 1f5489d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/include/micm/process/cuda_process_set.cuh b/include/micm/process/cuda_process_set.cuh
@@ -18,8 +18,7 @@ namespace micm
 
     std::chrono::nanoseconds AddJacobianTermsKernelDriver(
         micm::CUDAMatrixParam& matrixParam, 
-        CUDAProcessSetParam& processSetParam, 
-       // const size_t* number_of_reactants, 
+        const size_t* number_of_reactants, 
         const size_t* reactant_ids,
         size_t reactant_ids_size,
         const size_t* number_of_products,

diff --git a/include/micm/process/cuda_process_set.hpp b/include/micm/process/cuda_process_set.hpp
@@ -11,9 +11,6 @@
 #endif
 
 #ifdef USE_CUDA
-struct CUDAProcessSetParam{
-  const size_t* number_of_reactants; 
-};
 namespace micm
 {
   /// @brief A GPU-based implementation of ProcessSet
@@ -87,12 +84,9 @@ namespace micm
     matrixParam.n_reactions_ = rate_constants[0].size(); 
     matrixParam.n_species_ = state_variables[0].size(); 
     matrixParam.jacobian_size_ = jacobian.AsVector().size(); 
-    CUDAProcessSetParam processSetParam; 
-    processSetParam.number_of_reactants = number_of_reactants_.data(); 
     std::chrono::nanoseconds kernel_duration = micm::cuda::AddJacobianTermsKernelDriver(
         matrixParam, 
-        processSetParam, 
-        //number_of_reactants_.data(),
+        number_of_reactants_.data(),
         reactant_ids_.data(),
         reactant_ids_.size(),
         number_of_products_.data(),

diff --git a/src/process/process_set.cu b/src/process/process_set.cu
@@ -111,8 +111,7 @@ namespace micm
 
     std::chrono::nanoseconds AddJacobianTermsKernelDriver(
         micm::CUDAMatrixParam& matrixParam,
-        CUDAProcessSetParam& processSetParam, 
-        //const size_t* number_of_reactants,
+        const size_t* number_of_reactants,
         const size_t* reactant_ids,
         size_t reactant_ids_size,
         const size_t* number_of_products,
@@ -148,7 +147,7 @@ namespace micm
       cudaMemcpy(d_rate_constants, matrixParam.rate_constants_, sizeof(double) * matrixParam.n_grids_ * matrixParam.n_reactions_, cudaMemcpyHostToDevice);
       cudaMemcpy(d_state_variables, matrixParam.state_variables_, sizeof(double) * matrixParam.n_grids_ * matrixParam.n_species_, cudaMemcpyHostToDevice);
       cudaMemcpy(d_jacobian, matrixParam.jacobian_, sizeof(double) * matrixParam.jacobian_size_, cudaMemcpyHostToDevice);
-      cudaMemcpy(d_number_of_reactants, processSetParam.number_of_reactants, sizeof(size_t) * matrixParam.n_reactions_, cudaMemcpyHostToDevice);
+      cudaMemcpy(d_number_of_reactants, number_of_reactants, sizeof(size_t) * matrixParam.n_reactions_, cudaMemcpyHostToDevice);
       cudaMemcpy(d_reactant_ids, reactant_ids, sizeof(size_t) * reactant_ids_size, cudaMemcpyHostToDevice);
       cudaMemcpy(d_number_of_products, number_of_products, sizeof(size_t) * matrixParam.n_reactions_, cudaMemcpyHostToDevice);
       cudaMemcpy(d_yields, yields, sizeof(double) * yields_size, cudaMemcpyHostToDevice);
@@ -175,8 +174,7 @@ namespace micm
       AddJacobianTermsKernel<<<total_blocks, threads_per_block>>>(
           device,
           n_grids,
-          n_reactions
-          );
+          n_reactions);
       cudaDeviceSynchronize();
       auto endTime = std::chrono::high_resolution_clock::now();
       auto kernel_duration = std::chrono::duration_cast<std::chrono::nanoseconds>(endTime - startTime);