clean up

NCAR · Aug 28, 2023 · bbfd942 · bbfd942
1 parent a90de3c
commit bbfd942
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 55 deletions.
diff --git a/include/micm/process/cuda_process_set.cuh b/include/micm/process/cuda_process_set.cuh
@@ -6,7 +6,7 @@ namespace micm
   namespace cuda
   {
     std::chrono::nanoseconds AddForcingTermsKernelDriver(
-        micm::CUDAMatrixParam& matrixParam,
+        CUDAMatrixParam& matrixParam,
         const size_t* number_of_reactants,
         const size_t* reactant_ids,
         size_t reactant_ids_size,
@@ -17,16 +17,7 @@ namespace micm
         size_t yields_size); 
 
     std::chrono::nanoseconds AddJacobianTermsKernelDriver(
-        micm::CUDAMatrixParam& matrixParam, 
-        CUDAProcessSetParam& processSet
-        // const size_t* number_of_reactants, 
-        // const size_t* reactant_ids,
-        // size_t reactant_ids_size,
-        // const size_t* number_of_products,
-        // const double* yields,
-        // size_t yields_size,
-        // const size_t* jacobian_flat_ids,
-        // size_t jacobian_flat_ids_size
-        );
+        CUDAMatrixParam& matrixParam, 
+        CUDAProcessSetParam& processSet);
   }  // namespace cuda
 }  // namespace micm
diff --git a/include/micm/process/cuda_process_set.hpp b/include/micm/process/cuda_process_set.hpp
@@ -52,8 +52,7 @@ namespace micm
       const MatrixPolicy<double>& state_variables,
       MatrixPolicy<double>& forcing) const
   {
-    micm::CUDAMatrixParam matrixParam;
-
+    CUDAMatrixParam matrixParam;
     matrixParam.rate_constants_ = rate_constants.AsVector().data(); 
     matrixParam.state_variables_ = state_variables.AsVector().data(); 
     matrixParam.forcing_ = forcing.AsVector().data(); 
@@ -80,14 +79,15 @@ namespace micm
       const MatrixPolicy<double>& state_variables,
       SparseMatrixPolicy<double>& jacobian) const
   {
-    micm::CUDAMatrixParam matrixParam; 
+    CUDAMatrixParam matrixParam; 
     matrixParam.rate_constants_ = rate_constants.AsVector().data(); 
     matrixParam.state_variables_ = state_variables.AsVector().data(); 
     matrixParam.jacobian_= jacobian.AsVector().data(); 
     matrixParam.n_grids_ = rate_constants.size(); 
     matrixParam.n_reactions_ = rate_constants[0].size(); 
     matrixParam.n_species_ = state_variables[0].size(); 
     matrixParam.jacobian_size_ = jacobian.AsVector().size(); 
+
     CUDAProcessSetParam processSet; 
     processSet.number_of_reactants = number_of_reactants_.data(); 
     processSet.reactant_ids = reactant_ids_.data(); 
@@ -100,16 +100,7 @@ namespace micm
 
     std::chrono::nanoseconds kernel_duration = micm::cuda::AddJacobianTermsKernelDriver(
         matrixParam, 
-        processSet 
-        // number_of_reactants_.data(),
-        // reactant_ids_.data(),
-        // reactant_ids_.size(),
-        // number_of_products_.data(),
-        // yields_.data(),
-        // yields_.size(),
-        // jacobian_flat_ids_.data(),
-        // jacobian_flat_ids_.size()
-        );
+        processSet);
     return kernel_duration;  // time performance of kernel function
   }
 }  // namespace micm

diff --git a/include/micm/util/cuda_matrix_param.hpp b/include/micm/util/cuda_matrix_param.hpp
@@ -1,5 +1,3 @@
-#pragma once
-#include <vector> 
 
   struct CUDAProcessSetParam{
     const size_t* number_of_reactants; 
@@ -13,17 +11,15 @@
     const size_t* jacobian_flat_ids; 
     size_t jacobian_flat_ids_size; 
 }; 
-namespace micm{
-    class CUDAMatrixParam{
-        public: 
-        const double* rate_constants_; 
-        const double* state_variables_; 
-        double* forcing_; 
-        double* jacobian_; 
-        size_t n_grids_; 
-        size_t n_reactions_; 
-        size_t n_species_; 
-        size_t jacobian_size_; 
-        CUDAMatrixParam(){};
-    }; //end class
-}//end micm
+
+    struct CUDAMatrixParam{
+     const double* rate_constants_; 
+     const double* state_variables_; 
+     double* forcing_; 
+     double* jacobian_; 
+     size_t n_grids_; 
+     size_t n_reactions_; 
+     size_t n_species_; 
+     size_t jacobian_size_; 
+}; 
+
diff --git a/src/process/process_set.cu b/src/process/process_set.cu
@@ -110,18 +110,8 @@ namespace micm
     }      // end of AddJacobianTerms_kernel
 
     std::chrono::nanoseconds AddJacobianTermsKernelDriver(
-        micm::CUDAMatrixParam& matrixParam,
-        CUDAProcessSetParam& processSet
-
-        // const size_t* number_of_reactants,
-        // const size_t* reactant_ids,
-        // size_t reactant_ids_size,
-        // const size_t* number_of_products,
-        // const double* yields,
-        // size_t yields_size,
-        // const size_t* jacobian_flat_ids,
-        // size_t jacobian_flat_ids_size
-        )
+        CUDAMatrixParam& matrixParam,
+        CUDAProcessSetParam& processSet)
     {
       // create device pointers
       double* d_rate_constants;
@@ -197,7 +187,7 @@ namespace micm
     }  // end of AddJacobian_kernelSetup
 
     std::chrono::nanoseconds AddForcingTermsKernelDriver(
-        micm::CUDAMatrixParam& matrixParam,
+        CUDAMatrixParam& matrixParam,
         const size_t* number_of_reactants,
         const size_t* reactant_ids,
         size_t reactant_ids_size,
@@ -218,7 +208,6 @@ namespace micm
       size_t* d_product_ids_;
 
       // allocate device memory
-
       cudaMalloc(&d_rate_constants, sizeof(double) * (matrixParam.n_grids_ * matrixParam.n_reactions_));
       cudaMalloc(&d_state_variables, sizeof(double) * (matrixParam.n_grids_ * matrixParam.n_species_));
       cudaMalloc(&d_forcing, sizeof(double) * (matrixParam.n_grids_ * matrixParam.n_species_));