Fixing errors from github merged version

Fixed conflicts for clean compilation
Fixed clang-format
Adding free in C example

examples/hello/bpWriter/helloBPWriter.c

@@ -53,6 +53,8 @@ int main(int argc, char *argv[])
     adios2_close(engineH);
     adios2_finalize(adiosH);
 
+    free(myFloats);
+
     MPI_Finalize();
 
     return 0;

source/adios2/core/IO.cpp

@@ -91,7 +91,8 @@ IO::DefineVariableCompound(const std::string &name, const size_t sizeOfVariable,
 {
     if (m_DebugMode)
     {
-        if (VariableExists(name))
+        auto itVariable = m_Variables.find(name);
+        if (!IsEnd(itVariable, m_Variables))
         {
             throw std::invalid_argument("ERROR: variable " + name +
                                         " exists in IO object " + m_Name +

source/adios2/core/IO.h

@@ -140,7 +140,7 @@ public:
     template <class T>
     Variable<T> &DefineVariable(const std::string &name, const Dims &shape = {},
                                 const Dims &start = {}, const Dims &count = {},
-                                const bool constantShape = false);
+                                const bool constantDims = false);
 
     /**
      * Define a Variable of primitive data type for I/O.
@@ -159,8 +159,8 @@ public:
                                              const Dims &shape = Dims{},
                                              const Dims &start = Dims{},
                                              const Dims &count = Dims{},
-                                             const bool constantShape = false);
-  
+                                             const bool constantDims = false);
+
     VariableCompound &DefineVariableCompound(const std::string &name,
                                              const size_t sizeOfVariable,
                                              const Dims &shape = Dims{},

source/adios2/core/IO.tcc

@@ -28,7 +28,7 @@ namespace adios2
 template <class T>
 Variable<T> &IO::DefineVariable(const std::string &name, const Dims &shape,
                                 const Dims &start, const Dims &count,
-                                const bool constantShape)
+                                const bool constantDims)
 {
     if (m_DebugMode)
     {

source/adios2/core/Variable.tcc

@@ -24,7 +24,7 @@ namespace adios2
     template <>                                                                \
     Variable<T>::Variable(const std::string &name, const Dims &shape,          \
                           const Dims &start, const Dims &count,                \
-                          const bool constantShape, const bool debugMode)      \
+                          const bool constantDims, const bool debugMode)       \
     : VariableBase(name, GetType<T>(), sizeof(T), shape, start, count,         \
                    constantDims, debugMode)                                    \
     {                                                                          \