Fixing warnings

Author: areenraj

Common/include/linear_algebra/CSysMatrix.hpp

@@ -148,15 +148,10 @@ class CSysMatrix {
   ScalarType* d_matrix;           /*!< \brief Device Pointer to store the matrix values on the GPU. */
   const unsigned long* d_row_ptr; /*!< \brief Device Pointers to the first element in each row. */
   const unsigned long* d_col_ind; /*!< \brief Device Column index for each of the elements in val(). */
-<<<<<<< HEAD
-  bool useCuda;                   /*!< \brief Boolean that indicates whether user has enabled CUDA or not.
-                                     Mainly used to conditionally free GPU memory in the class destructor. */
-=======
   const unsigned long* d_dia_ptr; /*!< \brief Device Column index for each of the elements in val(). */
   unsigned long* d_partition_offsets;
   bool useCuda; /*!< \brief Boolean that indicates whether user has enabled CUDA or not.
                    Mainly used to conditionally free GPU memory in the class destructor. */
->>>>>>> precond_port
 
   ScalarType* ILU_matrix;           /*!< \brief Entries of the ILU sparse matrix. */
   unsigned long nnz_ilu;            /*!< \brief Number of possible nonzero entries in the matrix (ILU). */
@@ -868,11 +863,6 @@ class CSysMatrix {
                               const CConfig* config) const;
 
   /*!
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> precond_port
    * \brief Performs first step of the LU_SGS Preconditioner building
    * \param[in] vec - CSysVector to be multiplied by the sparse matrix A.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -898,10 +888,6 @@ class CSysMatrix {
   void GPUGaussElimination(ScalarType& prod, CGeometry* geometry, const CConfig* config) const;
 
   /*!
-<<<<<<< HEAD
->>>>>>> upstream/develop
-=======
->>>>>>> precond_port
    * \brief Multiply CSysVector by the preconditioner all of which are stored on the device
    * \param[in] vec - CSysVector to be multiplied by the preconditioner.
    * \param[out] prod - Result of the product A*vec.

Common/include/option_structure.hpp

@@ -89,7 +89,7 @@ namespace cudaKernelParameters{
   inline unsigned int rounded_down_division(int divisor, int dividend) { return ((dividend - divisor + 1) / divisor); }
 
   static constexpr short CUDA_WARP_SIZE = 32;  /*!< \brief Outlines the numbers of threads per warp for a CUDA GPU. */
-};
+}
 
 const unsigned int EXIT_DIVERGENCE = 2;   /*!< \brief Exit code (divergence). */