Resolve conflicts when updating from main

CEED · Aug 26, 2022 · 112a04a · 112a04a
1 parent 36d404f
commit 112a04a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/backends/cuda-ref/ceed-cuda-vector.c b/backends/cuda-ref/ceed-cuda-vector.c
@@ -113,8 +113,8 @@ static inline int CeedVectorSyncD2H_Cuda(const CeedVector vec) {
 // Sync arrays
 //------------------------------------------------------------------------------
 static int CeedVectorSyncArrayGeneric_Cuda(const CeedVector vec,
-                                           CeedMemType mem_type,
-					   CeedScalarType prec) {
+    CeedMemType mem_type,
+    CeedScalarType prec) {
   int ierr;
   // Check whether device/host sync is needed
   bool need_sync = false;

diff --git a/include/ceed/types.h b/include/ceed/types.h
@@ -112,8 +112,15 @@ typedef enum {
   /// Single precision
   CEED_SCALAR_FP32,
   /// Double precision
-  CEED_SCALAR_FP64
+  CEED_SCALAR_FP64,
+  /// Total number of allowed scalar precision types
+  CEED_NUM_PRECISIONS,
 } CeedScalarType;
+/// Struct for holding data in multiple precisions for mixed-precision-enabled
+/// backends
+typedef struct {
+  void *values[CEED_NUM_PRECISIONS]; // Size equals CEED_NUM_PRECISIONS
+} CeedScalarArray;
 /// Base scalar type for the library to use: change which header is 
 /// included to change the precision.
 #include "ceed-f64.h"