Skip to content

Commit

Permalink
Merge pull request #304 from sandialabs/fix_sycl_enum
Browse files Browse the repository at this point in the history
Fix enum for SYCL
  • Loading branch information
kuberry authored Dec 11, 2023
2 parents 578b38a + a862f87 commit 795d8da
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions src/Compadre_Operators.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Compadre {

//! Available target functionals
enum TargetOperation {
enum TargetOperation : int {
//! Point evaluation of a scalar
ScalarPointEvaluation,
//! Point evaluation of a vector (reconstructs entire vector at once, requiring a
Expand Down Expand Up @@ -92,7 +92,7 @@ namespace Compadre {
}

//! Space in which to reconstruct polynomial
enum ReconstructionSpace {
enum ReconstructionSpace : int {
//! Scalar polynomial basis centered at the target site and scaled by sum of basis powers
//! e.g. \f$(x-x_t)^2*(y-y_t)*(z-z_t)^3/factorial(2+1+3)\f$ would be a member of 3rd order in 3D, where
//! \f$(x_t,y_t,z_t)\f$ is the coordinate of the target site in 3D coordinates.
Expand Down Expand Up @@ -122,7 +122,7 @@ namespace Compadre {
}

//! Describes the SamplingFunction relationship to targets, neighbors
enum SamplingTransformType {
enum SamplingTransformType : int {
Identity, ///< No action performed on data before GMLS target operation
SameForAll, ///< Each neighbor for each target all apply the same transform
DifferentEachTarget, ///< Each target applies a different data transform, but the same to each neighbor
Expand Down Expand Up @@ -206,15 +206,15 @@ namespace Compadre {
CellIntegralSample = make_sampling_functional(0,0,false,false,(int)DifferentEachNeighbor);

//! Dense solver type
enum DenseSolverType {
enum DenseSolverType : int {
//! QR+Pivoting factorization performed on P*sqrt(w) matrix
QR,
//! LU factorization performed on P^T*W*P matrix
LU,
};

//! Problem type, that optionally can handle manifolds
enum ProblemType {
enum ProblemType : int {
//! Standard GMLS problem type
STANDARD,
//! Solve GMLS problem on a manifold (will use QR or SVD to solve the resultant GMLS
Expand All @@ -223,15 +223,15 @@ namespace Compadre {
};

//! Constraint type
enum ConstraintType {
enum ConstraintType : int {
//! No constraint
NO_CONSTRAINT,
//! Neumann Gradient Scalar Type
NEUMANN_GRAD_SCALAR,
};

//! Available weighting kernel function types
enum WeightingFunctionType {
enum WeightingFunctionType : int {
Power,
Gaussian,
CubicSpline,
Expand All @@ -241,7 +241,7 @@ namespace Compadre {

//! Coordinate type for input and output format of vector data on manifold problems.
//! Anything without a manifold is always Ambient.
enum CoordinatesType {
enum CoordinatesType : int {
Ambient, ///< a 2D manifold in 3D in ambient coordinates would have 3 components for a vector
Local, ///< a 2D manifold in 3D in local coordinates would have 2 components for a vector
};
Expand Down
2 changes: 1 addition & 1 deletion src/Compadre_Quadrature.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Compadre {

// ENUM for quadrature types
enum QuadratureType {INVALID, LINE, TRI, QUAD, TET, HEX};
enum QuadratureType : int {INVALID, LINE, TRI, QUAD, TET, HEX};

//! Quadrature
/*!
Expand Down

0 comments on commit 795d8da

Please sign in to comment.