Remove ADIOS2Datatype, add SCHAR to openPMD::Datatype

Author: franzpoeschel

include/openPMD/Datatype.hpp

@@ -42,7 +42,8 @@ namespace openPMD
 enum class Datatype : int
 {
     CHAR,
-    UCHAR, // SCHAR,
+    UCHAR,
+    SCHAR,
     SHORT,
     INT,
     LONG,
@@ -74,6 +75,7 @@ enum class Datatype : int
     VEC_CFLOAT,
     VEC_CDOUBLE,
     VEC_CLONG_DOUBLE,
+    VEC_SCHAR,
     VEC_STRING,
     ARR_DBL_7,
 
@@ -124,6 +126,10 @@ inline constexpr Datatype determineDatatype()
     {
         return DT::UCHAR;
     }
+    else if (decay_equiv<T, signed char>::value)
+    {
+        return DT::SCHAR;
+    }
     else if (decay_equiv<T, short>::value)
     {
         return DT::SHORT;
@@ -208,6 +214,10 @@ inline constexpr Datatype determineDatatype()
     {
         return DT::VEC_UCHAR;
     }
+    else if (decay_equiv<T, std::vector<signed char>>::value)
+    {
+        return DT::VEC_SCHAR;
+    }
     else if (decay_equiv<T, std::vector<unsigned short>>::value)
     {
         return DT::VEC_USHORT;
@@ -276,6 +286,10 @@ inline constexpr Datatype determineDatatype(std::shared_ptr<T>)
     {
         return DT::UCHAR;
     }
+    else if (decay_equiv<T, signed char>::value)
+    {
+        return DT::SCHAR;
+    }
     else if (decay_equiv<T, short>::value)
     {
         return DT::SHORT;
@@ -360,6 +374,10 @@ inline constexpr Datatype determineDatatype(std::shared_ptr<T>)
     {
         return DT::VEC_UCHAR;
     }
+    else if (decay_equiv<T, std::vector<signed char>>::value)
+    {
+        return DT::VEC_SCHAR;
+    }
     else if (decay_equiv<T, std::vector<unsigned short>>::value)
     {
         return DT::VEC_USHORT;
@@ -434,9 +452,9 @@ inline size_t toBytes(Datatype d)
     case DT::UCHAR:
     case DT::VEC_UCHAR:
         return sizeof(unsigned char);
-    // case DT::SCHAR:
-    // case DT::VEC_SCHAR:
-    //     return sizeof(signed char);
+    case DT::SCHAR:
+    case DT::VEC_SCHAR:
+        return sizeof(signed char);
     case DT::SHORT:
     case DT::VEC_SHORT:
         return sizeof(short);

include/openPMD/DatatypeHelpers.hpp

@@ -110,6 +110,8 @@ auto switchType(Datatype dt, Args &&...args)
     case Datatype::UCHAR:
         return Action::template call<unsigned char>(
             std::forward<Args>(args)...);
+    case Datatype::SCHAR:
+        return Action::template call<signed char>(std::forward<Args>(args)...);
     case Datatype::SHORT:
         return Action::template call<short>(std::forward<Args>(args)...);
     case Datatype::INT:
@@ -164,6 +166,9 @@ auto switchType(Datatype dt, Args &&...args)
     case Datatype::VEC_UCHAR:
         return Action::template call<std::vector<unsigned char> >(
             std::forward<Args>(args)...);
+    case Datatype::VEC_SCHAR:
+        return Action::template call<std::vector<signed char> >(
+            std::forward<Args>(args)...);
     case Datatype::VEC_USHORT:
         return Action::template call<std::vector<unsigned short> >(
             std::forward<Args>(args)...);
@@ -241,6 +246,8 @@ auto switchNonVectorType(Datatype dt, Args &&...args)
     case Datatype::UCHAR:
         return Action::template call<unsigned char>(
             std::forward<Args>(args)...);
+    case Datatype::SCHAR:
+        return Action::template call<signed char>(std::forward<Args>(args)...);
     case Datatype::SHORT:
         return Action::template call<short>(std::forward<Args>(args)...);
     case Datatype::INT:

include/openPMD/IO/ADIOS/ADIOS1Auxiliary.hpp

@@ -86,6 +86,8 @@ inline ADIOS_DATATYPES getBP1DataType(Datatype dtype)
     {
     case DT::CHAR:
     case DT::VEC_CHAR:
+    case DT::SCHAR:
+    case DT::VEC_SCHAR:
         return adios_byte;
     case DT::UCHAR:
     case DT::VEC_UCHAR: