diff --git a/Makefile b/Makefile
index 97a7a75034aa2ae8fcca69f7e21cb85b4e42ebf3..9573f136547489cd4da4ea5bfd0bb114992864e8 100644
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,13 @@ ADIOS_INC=-I./include
 INCLUDE=$(ADIOS_INC)
 
 #Build Header Dependencies, if one changes it will rebuild
-MPI_HFiles=$(shell find ./include/mpi -type f -name "*MPI.h")
+MPI_HFiles=$(shell find ./include/mpi -type f -name "*.h")
 NoMPI_HFiles=$(shell find ./include/nompi -type f -name "*NoMPI.h")
 Local_HFiles=$(shell find ./include -type f -name "*.h")
 HFiles=$(MPI_HFiles) $(NoMPI_HFiles) $(Local_HFiles)
 
 #Source *.cpp Files and Object Files
-MPI_CPPFiles=$(shell find ./src/mpi -type f -name "*MPI.cpp")
+MPI_CPPFiles=$(shell find ./src/mpi -type f -name "*.cpp")
 MPI_ObjFiles=$(patsubst ./src/mpi/transport/%.cpp, ./bin/%.o, $(MPI_CPPFiles))
 
 NoMPI_CPPFiles=$(shell find ./src/nompi -type f -name "*NoMPI.cpp")
diff --git a/doc/CodingGuidelines b/doc/CodingGuidelines
index d703524637954d528595d0b1ae7e722954e244a4..96ce8753976bb28581c9e497a6b060cbb5aef90f 100644
--- a/doc/CodingGuidelines
+++ b/doc/CodingGuidelines
@@ -5,7 +5,8 @@ CodingGuidelines
 
 This document introduces coding guidelines that all developers must follow as standard practice.
 This list is open as corrections and new ideas/suggestions come in place. Take them as mandatory to improve ADIOS.
-Many items from this list are taken from Stroustrup, Sutter, and Meyers books.      
+Many items from this list are taken from Stroustrup,
+ Sutter, and Meyers books.      
 
 Objectives:
 
diff --git a/doc/Doxyfile b/doc/Doxyfile
index a6c11c1bd6b9cdbc80581969500638e2636a15cf..a34e9963d9b916cea5dbae44f176686aeb793903 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -771,7 +771,7 @@ WARN_LOGFILE =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT = /home/wfg/workspace/ADIOSPP/include /home/wfg/workspace/ADIOSPP/include/mpi/transport /home/wfg/workspace/ADIOSPP/include/nompi/transport /home/wfg/workspace/ADIOSPP/src /home/wfg/workspace/ADIOSPP/src/mpi/transport /home/wfg/workspace/ADIOSPP/src/nompi/transport 
+INPUT = /home/wfg/workspace/ADIOSPP/include /home/wfg/workspace/ADIOSPP/include/mpi/transport /home/wfg/workspace/ADIOSPP/include/nompi/transport /home/wfg/workspace/ADIOSPP/include/transform /home/wfg/workspace/ADIOSPP/src /home/wfg/workspace/ADIOSPP/src/mpi/transport /home/wfg/workspace/ADIOSPP/src/nompi/transport 
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1988,7 +1988,7 @@ PERLMOD_MAKEVAR_PREFIX =
 # C-preprocessor directives found in the sources and include files.
 # The default value is: YES.
 
-ENABLE_PREPROCESSING = YES
+ENABLE_PREPROCESSING = NO
 
 # If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
 # in the source code. If set to NO, only conditional compilation will be
@@ -2339,7 +2339,7 @@ DOT_PATH =
 # command).
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOTFILE_DIRS = /home/wfg/workspace/ADIOSPP/include /home/wfg/workspace/ADIOSPP/include/mpi/transport /home/wfg/workspace/ADIOSPP/include/nompi/transport 
+DOTFILE_DIRS = /home/wfg/workspace/ADIOSPP/include /home/wfg/workspace/ADIOSPP/include/mpi/transport /home/wfg/workspace/ADIOSPP/include/nompi/transport
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the \mscfile
@@ -2424,4 +2424,4 @@ GENERATE_LEGEND = YES
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_CLEANUP = NO
+DOT_CLEANUP = YES
diff --git a/include/ADIOS.h b/include/ADIOS.h
index f60bea7f436c2d3622777e08dfc9ca65698bd21e..98e3a5d944a03344b7f4e526ef6ddfe57baf6e45 100644
--- a/include/ADIOS.h
+++ b/include/ADIOS.h
@@ -8,11 +8,11 @@
 #ifndef ADIOS_H_
 #define ADIOS_H_
 
-/// \cond
+/// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
 #include <memory>
 #include <ostream>
-/// \endcond ///
+/// \endcond
 
 #ifdef HAVE_MPI
   #include <mpi.h>
@@ -97,7 +97,7 @@ public: // PUBLIC Constructors and Functions define the User Interface with ADIO
      */
     void MonitorGroups( std::ostream& logStream ) const;
 
-    void Close( ); // dumps to file?
+    void Close( const std::string groupName ); // dumps to file?
 
 
 private:
diff --git a/include/ADIOSFunctions.h b/include/ADIOSFunctions.h
index 58eb9949c07727d10cc91adfe3cef7bbd96d393c..3949da4f028cb925311ada68f5ff3faaf5477e78 100644
--- a/include/ADIOSFunctions.h
+++ b/include/ADIOSFunctions.h
@@ -8,7 +8,7 @@
 #ifndef ADIOSFUNCTIONS_H_
 #define ADIOSFUNCTIONS_H_
 
-/// \cond
+/// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
 #include <vector>
 #include <map>
@@ -85,6 +85,7 @@ void SetMembers( const std::string& fileContent, std::string& hostLanguage, std:
  * @param fileContent file Content in a single string
  * @param hostLanguage return the host language from fileContent
  * @param groups passed returns the map of groups defined in fileContent
+ * @param mpiComm MPI Communicator passed from application
  */
 void SetMembers( const std::string& fileContent, std::string& hostLanguage, std::map< std::string, CGroup >& groups,
                  const MPI_Comm mpiComm );
diff --git a/include/CGroup.h b/include/CGroup.h
index 8d194e30f496d465a106a9714b19f6b4a2f42f6e..5720343f40b4a77a4109d8d827c42ab919bd0caa 100644
--- a/include/CGroup.h
+++ b/include/CGroup.h
@@ -8,7 +8,7 @@
 #ifndef CGROUP_H_
 #define CGROUP_H_
 
-/// \cond
+/// \cond EXCLUDE_FROM_DOXYGEN
 #include <map>
 #include <string>
 #include <memory> //for shared_pointer
@@ -120,6 +120,9 @@ public:
     void Monitor( std::ostream& logStream ) const; ///< Dumps information about Group variables
 
 
+    void Close( );
+
+
 private:
 
     /**
diff --git a/include/CTransform.h b/include/CTransform.h
new file mode 100644
index 0000000000000000000000000000000000000000..35a2a53569fa3319242b92202d34abd709c94b8d
--- /dev/null
+++ b/include/CTransform.h
@@ -0,0 +1,48 @@
+/*
+ * CTransform.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CTRANSFORM_H_
+#define CTRANSFORM_H_
+
+
+namespace adios
+{
+
+/**
+ * Parent class that defines data variable transformations. Used as a member of CVariable
+ */
+class CTransform
+{
+
+public:
+
+    const std::string m_Method; ///< name of the transformation method
+    const unsigned int m_CompressionLevel; ///< depends on library implementation
+    CVariable& m_Variable; ///< variable to be transformed
+
+    /**
+     * Initialize parent method
+     * @param method zlib, bzip2, szip
+     * @param variable
+     */
+    CTransform( const std::string method, CVariable& variable );
+
+    virtual ~CTransform( );
+
+    virtual void WriteTransform( ) = 0;
+
+    virtual void ReadTransform( ) = 0;
+
+    virtual void GetCompressedLength( ) const = 0;
+
+    virtual void GetExpandedLength( ) const = 0;
+
+};
+
+
+} //end namespace
+#endif /* CTRANSFORM_H_ */
diff --git a/include/CTransport.h b/include/CTransport.h
index b29f2a1d8d71291324760f2f82e52d2bcfaf7d2b..6f7fb7df91d78ccaf30039bada49b7fb546be105 100644
--- a/include/CTransport.h
+++ b/include/CTransport.h
@@ -8,9 +8,9 @@
 #ifndef CTRANSPORT_H_
 #define CTRANSPORT_H_
 
-///cond
+/// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
-///endcond
+/// \endcond
 
 #include "CVariable.h"
 
diff --git a/include/CVariable.h b/include/CVariable.h
index f15192840ae2610014afc650345bf8d59c5c0122..126989e2be3353c2a3513a952f6a6884b0ac22b1 100644
--- a/include/CVariable.h
+++ b/include/CVariable.h
@@ -8,12 +8,12 @@
 #ifndef CVARIABLE_H_
 #define CVARIABLE_H_
 
-///cond
+/// \cond EXCLUDE_FROM_DOXYGEN
 #include <string>
 #include <vector>
 #include <typeinfo> // for typeid
 #include <sstream>
-///endcond
+/// \endcond
 
 namespace adios
 {
diff --git a/include/SAttribute.h b/include/SAttribute.h
index daba14b02b7392b5f1a360b3ca191fd50c210c3f..2b023f670b194d61f5a5652fecb506dda067b126 100644
--- a/include/SAttribute.h
+++ b/include/SAttribute.h
@@ -8,10 +8,16 @@
 #ifndef SATTRIBUTE_H_
 #define SATTRIBUTE_H_
 
+/// \cond EXCLUDE_FROM_DOXYGEN
+#include <string>
+/// \endcond
 
 namespace adios
 {
 
+/**
+ * Plain-old data struct that defines an attribute in an ADIOS group in CGroup.h
+ */
 struct SAttribute
 {
     std::string Name; ///< Attribute name
@@ -28,7 +34,8 @@ struct SAttribute
      * @param value passed to Value
      * @param type passed to Type
      */
-    SAttribute( const std::string name, const bool isGlobal, const std::string type, const std::string path, const std::string value ):
+    SAttribute( const std::string name, const bool isGlobal, const std::string type, const std::string path,
+                const std::string value ):
         Name( name ),
         IsGlobal( isGlobal ),
         Type( type ),
diff --git a/include/SSupport.h b/include/SSupport.h
index e07d4399d80b54106520170dd29848f8e923d211..58c778d8fb706f7c016eaac60309f03eb36c78ea 100644
--- a/include/SSupport.h
+++ b/include/SSupport.h
@@ -8,16 +8,20 @@
 #ifndef SSUPPORT_H_
 #define SSUPPORT_H_
 
+/// \cond EXCLUDE_FROM_DOXYGEN
 #include <set>
 #include <string>
 #include <map>
+/// \endcond
 
 namespace adios
 {
 
-const std::string c_Version{"2.00"};
-
+const std::string c_Version{"2.00"}; ///< current version
 
+/**
+ * Supported host languages
+ */
 const std::set<std::string> c_HostLanguages {
     "C",
     "C++",
@@ -26,6 +30,9 @@ const std::set<std::string> c_HostLanguages {
     "Java"
 };
 
+/**
+ * Available transport methods
+ */
 const std::set<std::string> c_Transports {
     "NULL",
     "POSIX",
@@ -40,6 +47,9 @@ const std::set<std::string> c_Transports {
     "ICEE"
 };
 
+/**
+ * Available transformations
+ */
 const std::set<std::string> c_Transformations {
     "none",
     "identity",
@@ -47,10 +57,14 @@ const std::set<std::string> c_Transformations {
     "isobar"
 };
 
+/**
+ * Supported data types
+ */
 const std::map<std::string, std::string> c_DataTypes {
     { "unsigned integer", "unsigned int" },
     { "integer", "int" },
     { "real" , "float" },
+    { "float" , "float" },
     { "real*8" , "double" },
     { "double" , "double" },
 };
diff --git a/include/mpi/transport/CDIMES.h b/include/mpi/transport/CDIMES.h
new file mode 100644
index 0000000000000000000000000000000000000000..91fe74f4dc5fbea8eb0ffa25d76a770e03eccb45
--- /dev/null
+++ b/include/mpi/transport/CDIMES.h
@@ -0,0 +1,37 @@
+/*
+ * CDIMES.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CDIMES_H_
+#define CDIMES_H_
+
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+
+class CDIMES : public CTransportMPI
+{
+
+public:
+
+    CDIMES( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+
+    ~CDIMES( );
+
+    void Write( const CVariable& variable );
+};
+
+
+} //end namespace
+
+
+
+#endif /* CDIMES_H_ */
diff --git a/include/mpi/transport/CDataspaces.h b/include/mpi/transport/CDataspaces.h
new file mode 100644
index 0000000000000000000000000000000000000000..97a6397fb9d3ab1c16b724d4551080acde8cff2a
--- /dev/null
+++ b/include/mpi/transport/CDataspaces.h
@@ -0,0 +1,37 @@
+/*
+ * CDataspacesMPI.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CDATASPACES_H_
+#define CDATASPACES_H_
+
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+
+class CDataspaces : public CTransportMPI
+{
+
+public:
+
+    CDataspaces( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CDataspaces( );
+
+    void Write( const CVariable& variable );
+};
+
+
+} //end namespace
+
+
+
+
+#endif /* CDATASPACES_H_ */
diff --git a/include/mpi/transport/CFlexpath.h b/include/mpi/transport/CFlexpath.h
new file mode 100644
index 0000000000000000000000000000000000000000..aaf1aaaec5dbbc22fcb28647d37a5d6c41882b3d
--- /dev/null
+++ b/include/mpi/transport/CFlexpath.h
@@ -0,0 +1,35 @@
+/*
+ * CFlexpath.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CFLEXPATH_H_
+#define CFLEXPATH_H_
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+
+class CFlexpath : public CTransportMPI
+{
+
+public:
+
+    CFlexpath( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CFlexpath( );
+
+    void Write( const CVariable& variable );
+};
+
+
+} //end namespace
+
+
+
+#endif /* CFLEXPATH_H_ */
diff --git a/include/mpi/transport/CICEE.h b/include/mpi/transport/CICEE.h
new file mode 100644
index 0000000000000000000000000000000000000000..b7c719b0174498da6cfca32f53be065acac7286b
--- /dev/null
+++ b/include/mpi/transport/CICEE.h
@@ -0,0 +1,36 @@
+/*
+ * CICEEMPI.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CICEE_H_
+#define CICEE_H_
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+
+class CICEE : public CTransportMPI
+{
+
+public:
+
+    CICEE( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CICEE( );
+
+    void Write( const CVariable& variable );
+};
+
+
+} //end namespace
+
+
+
+
+#endif /* CICEE_H_ */
diff --git a/include/mpi/transport/CMPI.h b/include/mpi/transport/CMPI.h
new file mode 100644
index 0000000000000000000000000000000000000000..179937e3517cb7f1aa0b7f98304bf322021e7546
--- /dev/null
+++ b/include/mpi/transport/CMPI.h
@@ -0,0 +1,37 @@
+/*
+ * CMPI.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CMPI_H_
+#define CMPI_H_
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+/**
+ * Class that defines a transport method using MPI I/O API
+ */
+class CMPI : public CTransportMPI
+{
+
+public:
+
+    CMPI( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CMPI( );
+
+    void Write( const CVariable& variable );
+};
+
+
+} //end namespace
+
+
+
+#endif /* CMPI_H_ */
diff --git a/include/mpi/transport/CMPIAggregate.h b/include/mpi/transport/CMPIAggregate.h
new file mode 100644
index 0000000000000000000000000000000000000000..5903a9313ccd79be0ab63c70d5b75e56028da1e1
--- /dev/null
+++ b/include/mpi/transport/CMPIAggregate.h
@@ -0,0 +1,36 @@
+/*
+ * CMPIAggregate.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CMPIAGGREGATE_H_
+#define CMPIAGGREGATE_H_
+
+
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+
+class CMPIAggregate : public CTransportMPI
+{
+
+public:
+
+    CMPIAggregate( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CMPIAggregate( );
+
+    void Write( const CVariable& variable );
+};
+
+
+} //end namespace
+
+
+#endif /* CMPIAGGREGATE_H_ */
diff --git a/include/mpi/transport/CMPILustre.h b/include/mpi/transport/CMPILustre.h
new file mode 100644
index 0000000000000000000000000000000000000000..e9471060a6f4b4306645f15ae3e52ca8ab18e2e6
--- /dev/null
+++ b/include/mpi/transport/CMPILustre.h
@@ -0,0 +1,35 @@
+/*
+ * CMPILustre.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CMPILUSTRE_H_
+#define CMPILUSTRE_H_
+
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+
+class CMPILustre : public CTransportMPI
+{
+
+public:
+
+    CMPILustre( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CMPILustre( );
+
+    void Write( const CVariable& variable );
+};
+
+
+} //end namespace
+
+
+#endif /* CMPILUSTRE_H_ */
diff --git a/include/mpi/transport/CNetCDF4.h b/include/mpi/transport/CNetCDF4.h
new file mode 100644
index 0000000000000000000000000000000000000000..d9151c7ea4ab13db78b3ec8e15a0453892340d9e
--- /dev/null
+++ b/include/mpi/transport/CNetCDF4.h
@@ -0,0 +1,36 @@
+/*
+ * CNetCDF4.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CNETCDF4_H_
+#define CNETCDF4_H_
+
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+
+class CNetCDF4 : public CTransportMPI
+{
+
+public:
+
+    CNetCDF4( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CNetCDF4( );
+
+    void Write( const CVariable& variable );
+
+};
+
+
+} //end namespace
+
+
+#endif /* CNETCDF4_H_ */
diff --git a/include/mpi/transport/CPHDF5.h b/include/mpi/transport/CPHDF5.h
new file mode 100644
index 0000000000000000000000000000000000000000..1092766d25f8d7e770f949b2cdc9766c64279274
--- /dev/null
+++ b/include/mpi/transport/CPHDF5.h
@@ -0,0 +1,38 @@
+/*
+ * CPHDF5.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CPHDF5_H_
+#define CPHDF5_H_
+
+
+#include <hdf5.h>
+
+#include "mpi/transport/CTransportMPI.h"
+
+
+namespace adios
+{
+
+
+class CPHDF5 : public CTransportMPI
+{
+
+public:
+
+    CPHDF5( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CPHDF5( );
+
+    void Write( const CVariable& variable );
+};
+
+
+} //end namespace
+
+
+
+#endif /* CPHDF5_H_ */
diff --git a/include/mpi/transport/CPOSIXMPI.h b/include/mpi/transport/CPOSIX.h
similarity index 50%
rename from include/mpi/transport/CPOSIXMPI.h
rename to include/mpi/transport/CPOSIX.h
index db2977e7a196646afd997a8d3180f27bf3bb3b75..842b021979ea15c39dc0203fc54e38b43f868ca6 100644
--- a/include/mpi/transport/CPOSIXMPI.h
+++ b/include/mpi/transport/CPOSIX.h
@@ -5,8 +5,8 @@
  *      Author: wfg
  */
 
-#ifndef CPOSIXMPI_H_
-#define CPOSIXMPI_H_
+#ifndef CPOSIX_H_
+#define CPOSIX_H_
 
 
 #include <string>
@@ -19,15 +19,14 @@ namespace adios
 {
 
 
-class CPOSIXMPI : public CTransportMPI
+class CPOSIX : public CTransportMPI
 {
 
 public:
 
-    CPOSIXMPI( const std::string method, const unsigned int priority, const unsigned int iteration,
-               MPI_Comm mpiComm );
+    CPOSIX( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
 
-    ~CPOSIXMPI( );
+    ~CPOSIX( );
 
     void Write( const CVariable& variable );
 
@@ -41,4 +40,4 @@ public:
 
 
 
-#endif /* CPOSIXMPI_H_ */
+#endif /* CPOSIX_H_ */
diff --git a/include/mpi/transport/CVarMerge.h b/include/mpi/transport/CVarMerge.h
new file mode 100644
index 0000000000000000000000000000000000000000..24c8d6af030bed98c91fe1fb77a66f104493c7d9
--- /dev/null
+++ b/include/mpi/transport/CVarMerge.h
@@ -0,0 +1,33 @@
+/*
+ * CVarMerge.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CVARMERGE_H_
+#define CVARMERGE_H_
+
+
+namespace adios
+{
+
+
+class CVarMerge : public CTransportMPI
+{
+
+public:
+
+    CVarMerge( const unsigned int priority, const unsigned int iteration, MPI_Comm mpiComm );
+
+    ~CVarMerge( );
+
+    void Write( const CVariable& variable );
+
+};
+
+
+} //end namespace
+
+
+#endif /* CVARMERGE_H_ */
diff --git a/include/nompi/transport/CPOSIXNoMPI.h b/include/nompi/transport/CPOSIXNoMPI.h
index 4bd390f8fc6e2b9515613068978aa092fcd9caa0..92086e5e8d8b79ed156ea559771e041d6482a0aa 100644
--- a/include/nompi/transport/CPOSIXNoMPI.h
+++ b/include/nompi/transport/CPOSIXNoMPI.h
@@ -23,7 +23,7 @@ class CPOSIXNoMPI : public CTransportNoMPI
 
 public:
 
-    CPOSIXNoMPI( const std::string method, const unsigned int priority, const unsigned int iteration );
+    CPOSIXNoMPI( const unsigned int priority, const unsigned int iteration );
 
     ~CPOSIXNoMPI( );
 
diff --git a/include/nompi/transport/CStreamsNoMPI.h b/include/nompi/transport/CStreamsNoMPI.h
new file mode 100644
index 0000000000000000000000000000000000000000..b57401abf0ad2dc1533aae8cb377f6367d3378ac
--- /dev/null
+++ b/include/nompi/transport/CStreamsNoMPI.h
@@ -0,0 +1,48 @@
+/*
+ * CStreamsNoMPI.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CSTREAMSNOMPI_H_
+#define CSTREAMSNOMPI_H_
+
+
+
+#include "nompi/transport/CTransportNoMPI.h"
+
+
+namespace adios
+{
+
+
+
+class CStreamsNoMPI : public CTransportNoMPI
+{
+
+public:
+
+    CStreamsNoMPI( const unsigned int priority, const unsigned int iteration );
+
+    ~CStreamsNoMPI( );
+
+    void Write( const CVariable& variable );
+
+};
+
+
+
+} //end namespace
+
+
+
+
+
+
+#endif /* CPOSIXNOMPI_H_ */
+
+
+
+
+#endif /* CSTREAMSNOMPI_H_ */
diff --git a/include/nompi/transport/CThreadNoMPI.h b/include/nompi/transport/CThreadNoMPI.h
new file mode 100644
index 0000000000000000000000000000000000000000..762c4e3f1b66afd3d6907eebc33f2af70801a09d
--- /dev/null
+++ b/include/nompi/transport/CThreadNoMPI.h
@@ -0,0 +1,40 @@
+/*
+ * CThreadNoMPI.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CTHREADNOMPI_H_
+#define CTHREADNOMPI_H_
+
+
+#include "nompi/transport/CTransportNoMPI.h"
+
+
+namespace adios
+{
+
+
+/**
+ * Class that implementes asynchrounous I/O using C++ threads
+ */
+class CThreadNoMPI : public CTransportNoMPI
+{
+
+public:
+
+    CThreadNoMPI( const unsigned int priority, const unsigned int iteration );
+
+    ~CThreadNoMPI( );
+
+    void Write( const CVariable& variable );
+
+};
+
+
+
+} //end namespace
+
+
+#endif /* CTHREADNOMPI_H_ */
diff --git a/include/transform/CBZIP2.h b/include/transform/CBZIP2.h
new file mode 100644
index 0000000000000000000000000000000000000000..85ee032558fdeca2a94352331c0c0bd1c9757874
--- /dev/null
+++ b/include/transform/CBZIP2.h
@@ -0,0 +1,54 @@
+/*
+ * CBZIP2.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CBZIP2_H_
+#define CBZIP2_H_
+
+#ifdef BZIP2
+#include "bzip2.h" //bzip2 library header
+#endif
+
+#include "CTransform.h"
+
+
+namespace adios
+{
+
+
+class CBZIP2 : public CTransform
+{
+
+public:
+
+    const std::string m_Method; ///< name of the transformation method
+    const unsigned int m_CompressionLevel; ///< depends on library implementation
+    CVariable& m_Variable; ///< variable to be transformed
+
+    /**
+     * Initialize parent method
+     * @param variable
+     */
+    CBZIP2( CVariable& variable );
+
+    ~CBZIP2( );
+
+    void WriteTransform( );
+
+    void ReadTransform( );
+
+    void GetCompressedLength( ) const;
+
+    void GetExpandedLength( ) const;
+
+};
+
+
+} //end namespace
+
+
+
+#endif /* CBZIP2_H_ */
diff --git a/include/transform/CSZIP.h b/include/transform/CSZIP.h
new file mode 100644
index 0000000000000000000000000000000000000000..b3e01eab67fbd159d55907eb0724d73d5d3f2496
--- /dev/null
+++ b/include/transform/CSZIP.h
@@ -0,0 +1,55 @@
+/*
+ * CSZIP.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CSZIP_H_
+#define CSZIP_H_
+
+
+
+#include <szlib.h> //szip library header
+
+#include "CTransform.h"
+
+
+namespace adios
+{
+
+
+class CSZIP : public CTransform
+{
+
+public:
+
+    const std::string m_Method; ///< name of the transformation method
+    const unsigned int m_CompressionLevel; ///< depends on library implementation
+    CVariable& m_Variable; ///< variable to be transformed
+
+    /**
+     * Initialize parent method
+     * @param variable
+     */
+    CSZIP( CVariable& variable );
+
+    ~CSZIP( );
+
+    void WriteTransform( );
+
+    void ReadTransform( );
+
+    void GetCompressedLength( ) const;
+
+    void GetExpandedLength( ) const;
+
+};
+
+
+} //end namespace
+
+
+
+
+#endif /* CSZIP_H_ */
diff --git a/include/transform/CZLIB.h b/include/transform/CZLIB.h
new file mode 100644
index 0000000000000000000000000000000000000000..d212e6d72b0515e482796c96b9ebdb9f85a0cc5e
--- /dev/null
+++ b/include/transform/CZLIB.h
@@ -0,0 +1,53 @@
+/*
+ * CZLIB.h
+ *
+ *  Created on: Oct 17, 2016
+ *      Author: wfg
+ */
+
+#ifndef CZLIB_H_
+#define CZLIB_H_
+
+
+#include <zlib.h>
+
+#include "CTransform.h"
+
+
+namespace adios
+{
+
+
+class CZLIB : public CTransform
+{
+
+public:
+
+    const std::string m_Method; ///< name of the transformation method
+    const unsigned int m_CompressionLevel; ///< depends on library implementation
+    CVariable& m_Variable; ///< variable to be transformed
+
+    /**
+     * Initialize parent method
+     * @param variable
+     */
+    CZLIB( CVariable& variable );
+
+    ~CZLIB( );
+
+    void WriteTransform( );
+
+    void ReadTransform( );
+
+    void GetCompressedLength( ) const;
+
+    void GetExpandedLength( ) const;
+
+};
+
+
+} //end namespace
+
+
+
+#endif /* CZLIB_H_ */
diff --git a/src/ADIOS.cpp b/src/ADIOS.cpp
index 91a471fbb3b3ef177f651992689b594de025aeee..3770dde548669db93c3f55212efb36de30f433d8 100644
--- a/src/ADIOS.cpp
+++ b/src/ADIOS.cpp
@@ -6,10 +6,12 @@
  *
  */
 
+/// \cond EXCLUDE_FROM_DOXYGEN
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <utility>
+/// \endcond
 
 #include "ADIOS.h"
 #include "ADIOSFunctions.h"
@@ -109,6 +111,10 @@ template<class T> void ADIOS::Write( const std::string groupName, const std::str
     m_Groups.at( groupName ).Write( variableName, values );
 }
 
+void ADIOS::Close( const std::string groupName )
+{
+    m_Groups.at( groupName ).Close();
+}
 
 void ADIOS::MonitorGroups( std::ostream& logStream ) const
 {
@@ -119,7 +125,6 @@ void ADIOS::MonitorGroups( std::ostream& logStream ) const
     }
 }
 
-
 void ADIOS::CheckGroup( const std::string groupName )
 {
     auto it = m_Groups.find( groupName );
@@ -127,4 +132,5 @@ void ADIOS::CheckGroup( const std::string groupName )
 }
 
 
+
 } //end namespace
diff --git a/src/ADIOSFunctions.cpp b/src/ADIOSFunctions.cpp
index ae458f21dcab633f9ace2a31fe95d9387cecb146..4dc7c68aaa325b629bdeeb0474f96881fb38f2b6 100644
--- a/src/ADIOSFunctions.cpp
+++ b/src/ADIOSFunctions.cpp
@@ -5,12 +5,12 @@
  *      Author: wfg
  */
 
-///cond
+/// \cond EXCLUDED_FROM_DOXYGEN
 #include <fstream>
 #include <sstream>
 #include <stdexcept>
 #include <iostream>
-///endcond
+/// \endcond
 
 #include "ADIOSFunctions.h"
 #include "SSupport.h"
diff --git a/src/CGroup.cpp b/src/CGroup.cpp
index effe3131f7e070d95ca4d221ecb774bc59f2496a..2eced4afc41fd80968f3828a64f245ba0e87ff07 100644
--- a/src/CGroup.cpp
+++ b/src/CGroup.cpp
@@ -5,15 +5,17 @@
  *      Author: wfg
  */
 
+/// \cond EXCLUDED_FROM_DOXYGEN
 #include <iostream>
-
+/// \endcond
+///
 #include "CGroup.h"
 #include "ADIOSFunctions.h"
 #include "SSupport.h"
 
 //MPI transport methods
 #ifdef HAVE_MPI
-#include "mpi/transport/CPOSIXMPI.h"
+#include "mpi/transport/CPOSIX.h"
 #endif
 
 #include "nompi/transport/CPOSIXNoMPI.h"
@@ -98,13 +100,13 @@ void CGroup::SetTransport( const std::string method, const unsigned int priority
                            const MPI_Comm mpiComm )
 {
     CheckTransport( method );
-    if( m_ActiveTransport == "POSIX" ) m_Transport = std::make_shared<CPOSIXMPI>( method, priority, iteration, mpiComm );
+    if( m_ActiveTransport == "POSIX" ) m_Transport = std::make_shared<CPOSIX>( method, priority, iteration, mpiComm );
 }
 #endif
 
 
-//PRIVATE FUNCTIONS BELOW
 
+//PRIVATE FUNCTIONS BELOW
 void CGroup::Monitor( std::ostream& logStream ) const
 {
     logStream << "\tVariable \t Type\n";
@@ -193,6 +195,12 @@ void CGroup::ParseXMLGroup( const std::string& xmlGroup, std::string& groupName
     } //end while loop
 }
 
+void CGroup::Close( )
+{
+    //Need to implement
+}
+
+
 
 void CGroup::CheckTransport( const std::string method )
 {
diff --git a/src/mpi/transport/CPOSIXMPI.cpp b/src/mpi/transport/CPOSIX.cpp
similarity index 52%
rename from src/mpi/transport/CPOSIXMPI.cpp
rename to src/mpi/transport/CPOSIX.cpp
index 3670c4620b9ab976270a91419aa7dd36f7ad7164..33b57aa1ef8c9d2beaf5e8e242cf64fc1f5f0e36 100644
--- a/src/mpi/transport/CPOSIXMPI.cpp
+++ b/src/mpi/transport/CPOSIX.cpp
@@ -5,27 +5,26 @@
  *      Author: wfg
  */
 
+#include <iostream>
 
-
-
-#include "mpi/transport/CPOSIXMPI.h"
+#include "include/mpi/transport/CPOSIX.h"
 
 
 namespace adios
 {
 
 
-CPOSIXMPI::CPOSIXMPI( const std::string method, const unsigned int priority, const unsigned int iteration,
-                      MPI_Comm mpiComm ):
-    CTransportMPI( method, priority, iteration, mpiComm )
+CPOSIX::CPOSIX( const unsigned int priority, const unsigned int iteration,
+                MPI_Comm mpiComm ):
+    CTransportMPI( "POSIX", priority, iteration, mpiComm )
 { }
 
 
-CPOSIXMPI::~CPOSIXMPI( )
+CPOSIX::~CPOSIX( )
 { }
 
 
-void CPOSIXMPI::Write( const CVariable& variable )
+void CPOSIX::Write( const CVariable& variable )
 {
     int rank;
     MPI_Comm_rank( m_MPIComm, &rank );