Restructure the Hdf5fed directory.

Hdf5fed/applications/gmsh2hdf5fed.cc

@@ -1,20 +1,21 @@
 // rights - 2006-, copyright patrick leidenberger and benedikt oswald,
 //                 all rights reserved
-// project   - gmsh2h5fed
-// file name - gmsh2h5fed.cc
+// project   - gmsh2hdf5fed
+// file name - gmsh2hdf5fed.cc
 // file type - c++ implementaton file
 // objective - main file for the gmsh to hdf5fed converter
 // modified  - 2006 jun 26, creation, patrick leidenberger
 // modified  - 2006 aug 25, extend, patrick leidenberger
 // modified  - 2006 aug 26, pl, integrate automatic index mapping.
 // modified  - 2006 sep 22, pl, addaped to h5fed api changes.
+// modified  - 2006 sep 22, pl, change h5fed -> hdf5fed.
 //
 // feature - Implements the a mesh preprocessor.
 // feature - It will read gmsh's mesh files of version 2.0 and write the mesh
 // feature - into an HDF5/FiniteElementData file.
 // required software - rlog library, boost library 
 
-#include <gmsh2h5fed.hh>
+#include <gmsh2hdf5fed.hh>
 
 using namespace rlog;
 
@@ -143,17 +144,17 @@ int main(int argc, char **argv)
   // Get a vector with all node coordinates from the gmsh file.
   gmshNodes = gmshInFile.gmshNode();
   
-  // Put all H5Fed funktions in here.
+  // Put all Hdf5fed funktions in here.
   #ifdef HAVE_HDF5
   // Create H5Fed class instance. 
-  H5Fed::H5Fed h5fedFile;
+  Hdf5fed::Hdf5fed h5fedFile;
   
-  // Open H5Fed file for writing. Filename and file write access comes
+  // Open Hdf5fed file for writing. Filename and file write access comes
   // from command line parameters. 
   if (writeFileForce == false)
-    h5fedFile.open(hdf5fedOutputFile,H5Fed::FILE_CREATE);
+    h5fedFile.open(hdf5fedOutputFile,Hdf5fed::FILE_CREATE);
   else
-    h5fedFile.open(hdf5fedOutputFile,H5Fed::FILE_CREATE_FORCE);
+    h5fedFile.open(hdf5fedOutputFile,Hdf5fed::FILE_CREATE_FORCE);
 
   // Create the group hierarchie in the hdf5fed file.
   h5fedFile.createGroupHierarchie();
@@ -212,7 +213,7 @@ int main(int argc, char **argv)
   // with an gmsh file index.
   h5fedFile.endIndexMapping();
 
-  // Close H5Fed file.
+  // Close Hdf5fed file.
   h5fedFile.close();
   
     

Hdf5fed/applications/gmsh2hdf5fed.hh

@@ -48,17 +48,17 @@
 // Include the Hdf5FiniteElementData API.
 #ifdef HAVE_HDF5
   // Include the Hdf5FiniteElementData API.
-  #include <h5fed.hh>
+  #include <hdf5fed.hh>
   // Include h5fed specific constants.
-  #include <h5fedconst.hh>
+  #include <hdf5fedconst.hh>
 #else
   #warning No hdf5 lib found!!
 #endif
 
 
 
-#ifndef PHIDIAS3D_H_
-#define PHIDIAS3D_H_
+#ifndef GMSH2HDF5FED_HH_
+#define GMSH2HDF5FED_HH_
 
 using namespace physicomath;
 using namespace nonsciconst;
@@ -66,4 +66,4 @@ using namespace gmshtohdf5fed;
 
 
 
-#endif /*PHIDIAS3D_H_*/
+#endif /* GMSH2HDF5FED_HH_ */

Hdf5fed/applications/hdf5feddump.cc

@@ -1,9 +1,9 @@
 // rights - 2006-, copyright patrick leidenberger and benedikt oswald,
 //                 all rights reserved
-// project   - h5feddump
-// file name - h5feddump.cc
+// project   - hdf5feddump
+// file name - hdf5feddump.cc
 // file type - c++ implementaton file
-// objective - main file h5fed dump program
+// objective - main file hdf5fed dump program
 // modified  - 2006 sep 21, creation, patrick leidenberger.
 // modified  - 2006 sep 22, pl, add dump for coordinates.
 //
@@ -13,7 +13,7 @@
 // feature - There are different options on command line what to dump.
 // required software - rlog library, boost library 
 
-#include <h5feddump.hh>
+#include <hdf5feddump.hh>
 
 using namespace rlog;
 
@@ -93,20 +93,20 @@ int main(int argc, char **argv)
   // Start with the main work //
   //==========================//
 
-  // Put all H5Fed funktions in here.
+  // Put all Hdf5fed funktions in here.
   #ifdef HAVE_HDF5
   // Create H5Fed class instance. 
-  H5Fed::H5Fed h5fedFile;
+  Hdf5fed::Hdf5fed h5fedFile;
   
-  // Open H5Fed file for reading. Filename comes from 
+  // Open Hdf5fed file for reading. Filename comes from 
   // command line parameters. 
-  h5fedFile.open(hdf5fedFile,H5Fed::FILE_READ);
+  h5fedFile.open(hdf5fedFile,Hdf5fed::FILE_READ);
 
   // Vector for the tetrahedorn nodes and the material tag.
   std::vector< std::vector<unsigned int> > elem;
   std::vector<unsigned int> materialIndex;
 
-  // Read the tetrahedrons of the h5fed file an print them.
+  // Read the tetrahedrons of the hdf5fed file an print them.
 /*  h5fedFile.rTetrahedron((unsigned int)0, elem, materialIndex);
   for(int varI = 0; varI<elem.size(); varI++)
   {
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
            materialIndex[varI]);
   }
 */
-  // Read the boundary trianglel of the h5fed file an print them.
+  // Read the boundary trianglel of the hdf5fed file an print them.
   h5fedFile.rTriangleB((unsigned int)0, (unsigned int) 0, elem, materialIndex);
   for(int varI = 0; varI<elem.size(); varI++)
   {
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
   }
   
 */  
-  // Close H5Fed file.
+  // Close Hdf5fed file.
   h5fedFile.close();
     
   #endif // HAVE_HDF5

Hdf5fed/applications/hdf5feddump.hh

@@ -7,9 +7,10 @@
 // objective - header file for the h5feddump
 // modified  - 2006 sep 21, creation, Patrick Leidenberger
 // modified  - 2006 sep 22, pl, add dump for coordinates.
+// modified  - 2006 sep 25, pl, chage h5fed -> hdf5fed.
 
-#ifndef H5FEDDUMP_H_
-#define H5FEDDUMP_H_
+#ifndef HDF5FEDDUMP_HH_
+#define HDF5FEDDUMP_HH_
 
 /* include standard header files */
 #include <cmath>
@@ -41,9 +42,9 @@
 // Include the Hdf5FiniteElementData API.
 #ifdef HAVE_HDF5
   // Include the Hdf5FiniteElementData API.
-  #include <h5fed.hh>
+  #include <hdf5fed.hh>
   // Include h5fed specific constants.
-  #include <h5fedconst.hh>
+  #include <hdf5fedconst.hh>
 #else
   #warning No hdf5 lib found!!
 #endif
@@ -53,4 +54,4 @@ using namespace nonsciconst;
 //using namespace H5Fed;
 //using namespace gmshtohdf5fed;
 
-#endif /*PHIDIAS3D_H_*/
+#endif /* HDF5FEDDUMP_HH_ */

Hdf5fed/libsrc/hdf5fed/hdf5fed.hh

@@ -13,8 +13,8 @@
 // feature - library.
 // required software - 
 
-#ifndef H5FED_HH_
-#define H5FED_HH_
+#ifndef HDF5FED_HH_
+#define HDF5FED_HH_
 
 #ifdef HAVE_HDF5
 
@@ -39,7 +39,7 @@
 #include <hdf5.h>
 
 // Include h5fed specific constants.
-#include "h5fedconst.hh"
+#include "hdf5fedconst.hh"
 
 /* include standard proprietary header files */
 /*
@@ -52,14 +52,14 @@
 //using namespace physicomath;
 //using namespace nonsciconst;
 
-namespace H5Fed
+namespace Hdf5fed
 {
 
-class H5Fed {
+class Hdf5fed {
 public:
 
   /** \brief constructor and destructor */
-  H5Fed()
+  Hdf5fed()
   {
     doIndexMapping_ = false;
     indexMap_.clear();
@@ -70,7 +70,7 @@ public:
   };
 
   // The Destructor.
-  ~H5Fed(){};
+  ~Hdf5fed(){};
 
   //! Open an hdf5 finite element data file with appropriate access.
   int open(std::string fileName, std::string fileAccess)
@@ -135,33 +135,34 @@ public:
   {
     // Hdf5 group identifier for group access, localy valid (this method).
     hid_t hdf5GroupIdent_;
-    // Create the groups. All group-name strings are defined in h5fedconst.hh.
+    // Create the groups. All group-name strings are defined in 
+    // hdf5fedconst.hh.
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_ROOT.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_ROOT.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_COORD.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_COORD.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_VOLUME_MESH.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_VOLUME_MESH.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_BOUNDARY_MESH.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_BOUNDARY_MESH.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_MATERIAL.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_MATERIAL.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_ELECTROMAGNETIC.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_ELECTROMAGNETIC.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_DISCRETE.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_DISCRETE.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_PHYSICAL.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_PHYSICAL.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_DEBYE.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_DEBYE.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_LORENTZ.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_LORENTZ.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_DRUDE.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_DRUDE.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_DOF.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_DOF.c_str(),H5P_DEFAULT);
     hdf5GroupIdent_ = H5Gcreate(hdf5FileIdent_,
-                              H5FED_G_FIELD.c_str(),H5P_DEFAULT);
+                              HDF5FED_G_FIELD.c_str(),H5P_DEFAULT);
     return OKCODE;
   };
 
@@ -211,7 +212,7 @@ public:
     return OKCODE;
   };
 
-  // Write 3dim coordinates to h5fed file.
+  // Write 3dim coordinates to hdf5fed file.
   int wCoord3d (std::vector<std::vector<double> >& coord)
   {
     // All these operations are only allowed, if there is a valid file
@@ -268,8 +269,8 @@ public:
       hdf5DataspaceId = H5Screate_simple(rank, dim, H5P_DEFAULT);
 
       // Create dataset of full size.
-      hdf5DatasetId = H5Dcreate(hdf5FileIdent_, H5FED_D_COORD3D.c_str(), 
-                                H5FED_COORD_DATATYPE,
+      hdf5DatasetId = H5Dcreate(hdf5FileIdent_, HDF5FED_D_COORD3D.c_str(), 
+                                HDF5FED_COORD_DATATYPE,
                                 hdf5DataspaceId, H5P_DEFAULT);
       
 
@@ -336,7 +337,7 @@ public:
     }
   };
 
-  // Read 3dim coordinates from h5fed file.
+  // Read 3dim coordinates from hdf5fed file.
   int rCoord3d (std::vector<std::vector<double> >& coord)
   {
     // All these operations are only allowed, if there is a valid file
@@ -344,7 +345,7 @@ public:
     if (hdf5FileIdent_ >= 0)
     {
       // The name of the dataset.
-      std::string datasetName = H5FED_D_COORD3D;
+      std::string datasetName = HDF5FED_D_COORD3D;
       // Define the rank of the different dataspaces.
       const int rank = 2;
       // Hdf5 error handling variable for Hdf5 actions.
@@ -443,7 +444,7 @@ public:
     }
     else 
     {
-      rError("You cannot operate to dataset %s.",H5FED_D_COORD3D.c_str());
+      rError("You cannot operate to dataset %s.",HDF5FED_D_COORD3D.c_str());
       rError("There is no valid file identifier.");
       return ERRORCODE;
     }
@@ -456,22 +457,22 @@ public:
                    std::vector<unsigned int>& materialIndex)
   {
     // Set the name of the dataset, we want to read.
-    std::string datasetName = H5FED_D_TETMESH;
+    std::string datasetName = HDF5FED_D_TETMESH;
     rElement_(datasetName, level, -1, elem, materialIndex);
     return OKCODE;
   };
 
-  // Copy the tetrahedon elements to the h5fed filse.
+  // Copy the tetrahedon elements to the hdf5fed filse.
   int wTetrahedron(unsigned int level,
                    std::vector< std::vector<unsigned int> >& elem,
                    std::vector<unsigned int>& materialIndex)
   {
     // Set dimension of an elements vector.
-    unsigned int elemDim = H5FED_TET_N_NODE;
+    unsigned int elemDim = HDF5FED_TET_N_NODE;
     // Set the name of the dataset, we want to operate.
-    std::string datasetName = H5FED_D_TETMESH;
+    std::string datasetName = HDF5FED_D_TETMESH;
     // Select the data type in which the elements should be stored.
-    hid_t dataType = H5FED_MESH_ELEM_DATATYPE;
+    hid_t dataType = HDF5FED_MESH_ELEM_DATATYPE;
     // This function does the real work for all elements.
     wElement_(datasetName, level, -1, elemDim, elem, materialIndex, dataType);
     return OKCODE;
@@ -483,11 +484,11 @@ public:
                  std::vector<unsigned int>& boundaryIndex)
   {
     // Set dimension of an elements vector.
-    unsigned int elemDim = H5FED_TRIANGLE_N_NODE;
+    unsigned int elemDim = HDF5FED_TRIANGLE_N_NODE;
     // Set the name of the dataset, we want to operate.
-    std::string datasetName = H5FED_D_TRIANGLEBOUNDARY;
+    std::string datasetName = HDF5FED_D_TRIANGLEBOUNDARY;
     // Select the data type in which the elements should be stored.
-    hid_t dataType = H5FED_MESH_ELEM_DATATYPE;
+    hid_t dataType = HDF5FED_MESH_ELEM_DATATYPE;
     // This function does the real work for all elements.
     wElement_(datasetName, level, (int)number,  elemDim, elem, boundaryIndex, dataType);
     return OKCODE;
@@ -501,7 +502,7 @@ public:
                  std::vector<unsigned int>& boundaryIndex)
   {
     // Set the name of the dataset, we want to read.
-    std::string datasetName = H5FED_D_TRIANGLEBOUNDARY;
+    std::string datasetName = HDF5FED_D_TRIANGLEBOUNDARY;
     rElement_(datasetName, level, (int)number, elem, boundaryIndex);
     return OKCODE;
   };
@@ -690,7 +691,7 @@ public:
   };
 
   // This function gets the level and name of an element in
-  // a H5Fed file and returns the element nodes and material tag as a
+  // a Hdf5fed file and returns the element nodes and material tag as a
   // vetor of vectors and a vector.
   // datasetNameBlank: the name of the elements dataset without the level!
   //                   (example: ../TETMESH_L)
@@ -839,7 +840,7 @@ public:
     }
   };
 
-  // Write 3dim coordinates to h5fed file.
+  // Write 3dim coordinates to hdf5fed file.
   bool existsDataspace (std::string dataspaceName)
   {
     // All these operations are only allowed, if there is a valid file
@@ -1002,9 +1003,9 @@ private:
   //-----------------------------------------------------------------------//
   // Private data structure.                                               //
   //-----------------------------------------------------------------------//
-  // Store the filename of the H5Fed here.
+  // Store the filename of the Hdf5fed here.
   std::string fileName_;
-  // Store the file access rights of the H5Fed here.
+  // Store the file access rights of the Hdf5fed here.
   std::string fileAccess_;
 
   // Hdf5 error variable stores the success of an Hdf5 action.
@@ -1013,15 +1014,15 @@ private:
   // identifyer is negetive.
   hid_t hdf5FileIdent_;
   
-  // If the elements we want to write to the h5fed file are not consecutive
+  // If the elements we want to write to the hdf5fed file are not consecutive
   // and with gaps numbered, this API shoud be able to map this to an gapfree
   // and consecutive index set.
   // To activate this function we have the following variable.
   bool doIndexMapping_;
   // The first entry in indexMap_ is the old index of a coordinate, the
-  // second is the new index usend in the h5fed file.
+  // second is the new index usend in the hdf5fed file.
   std::map<unsigned int, unsigned int> indexMap_;
-  // The first entry in positionMap_ is the new index usend in the h5fed
+  // The first entry in positionMap_ is the new index usend in the hdf5fed
   // file, the second is the old postion in the coordinate vector.
   std::map<unsigned int, unsigned int> positionMap_;
 
@@ -1049,9 +1050,9 @@ private:
 			
 };
 
-} // End of namespace H5Fed
+} // End of namespace Hdf5fed
 
 #elif
-#warning "No HDF5 found. You cannot use h5fed."
+#warning "No HDF5 found. You cannot use hdf5fed."
 #endif // HAVE_HDF5
-#endif //H5FED_HH_
+#endif //HDF5FED_HH_

Hdf5fed/libsrc/hdf5fed/hdf5fedconst.hh

@@ -1,12 +1,27 @@
-#ifndef H5FEDCONST_HH_
-#define H5FEDCONST_HH_
+// rights  2006- , 
+//             copyright patrick leidenberger and benedikt oswald,
+//             all rights reserved
+// project   - hdf5fedconst.hh
+// file name - hdf5fedconst.cc
+// file type - c++ header file
+// objective - header file for the hdf5fed api.
+// modified  - 2006 sep 25, pl, add this comment and change h5fed -> hdf5fed.
+//
+// feature - Defines the group and dataset names in hdf5fed file.
+// feature - Defines some topological constants.
+// feature - Defines file access constans.
+//
+// required software - stl, hdf5 library
+
+#ifndef HDF5FEDCONST_HH_
+#define HDF5FEDCONST_HH_
 
 #include<string>
 
 // Include HDF5 headers.
 #include <hdf5.h>
 
-namespace H5Fed
+namespace Hdf5fed
 {
   
 // Return values.
@@ -24,44 +39,50 @@ const std::string FILE_CREATE("c");
 const std::string FILE_CREATE_FORCE("cf");
 
 // Define the group names of the H5Fed starndard groups.
-const std::string H5FED_G_ROOT                ("/HDF5_FINITE_ELEMENT_DATA");
-  const std::string H5FED_G_COORD             (H5FED_G_ROOT+"/COORD");
-  const std::string H5FED_G_VOLUME_MESH       (H5FED_G_ROOT+"/VOLUME_MESH");
-  const std::string H5FED_G_BOUNDARY_MESH     (H5FED_G_ROOT+"/BOUNDARY_MESH");
-  const std::string H5FED_G_MATERIAL          (H5FED_G_ROOT+"/MATERIAL");
-    const std::string H5FED_G_ELECTROMAGNETIC (H5FED_G_MATERIAL+"/ELECTROMAGNETIC");
-      const std::string H5FED_G_DISCRETE      (H5FED_G_ELECTROMAGNETIC+"/DISCRETE");
-      const std::string H5FED_G_PHYSICAL      (H5FED_G_ELECTROMAGNETIC+"/PHYSICAL");
-        const std::string H5FED_G_DEBYE       (H5FED_G_PHYSICAL+"/DEBYE");
-        const std::string H5FED_G_LORENTZ     (H5FED_G_PHYSICAL+"/LORENTZ");
-        const std::string H5FED_G_DRUDE       (H5FED_G_PHYSICAL+"/DRUDE");
-  const std::string H5FED_G_DOF               (H5FED_G_ROOT+"/DOF");
-  const std::string H5FED_G_FIELD             (H5FED_G_ROOT+"/FIELD");
+const std::string HDF5FED_G_ROOT           ("/HDF5_FINITE_ELEMENT_DATA");
+const std::string HDF5FED_G_COORD          (HDF5FED_G_ROOT+"/COORD");
+const std::string HDF5FED_G_VOLUME_MESH    (HDF5FED_G_ROOT+"/VOLUME_MESH");
+const std::string HDF5FED_G_BOUNDARY_MESH  (HDF5FED_G_ROOT+"/BOUNDARY_MESH");
+const std::string HDF5FED_G_MATERIAL       (HDF5FED_G_ROOT+"/MATERIAL");
+const std::string HDF5FED_G_ELECTROMAGNETIC 
+                    (HDF5FED_G_MATERIAL+"/ELECTROMAGNETIC");
+const std::string HDF5FED_G_DISCRETE  (HDF5FED_G_ELECTROMAGNETIC+"/DISCRETE");
+const std::string HDF5FED_G_PHYSICAL  (HDF5FED_G_ELECTROMAGNETIC+"/PHYSICAL");
+const std::string HDF5FED_G_DEBYE     (HDF5FED_G_PHYSICAL+"/DEBYE");
+const std::string HDF5FED_G_LORENTZ   (HDF5FED_G_PHYSICAL+"/LORENTZ");
+const std::string HDF5FED_G_DRUDE     (HDF5FED_G_PHYSICAL+"/DRUDE");
+const std::string HDF5FED_G_DOF       (HDF5FED_G_ROOT+"/DOF");
+const std::string HDF5FED_G_FIELD     (HDF5FED_G_ROOT+"/FIELD");
 
 
 // Define the dataset names of the H5Fed standard datasets.
-const std::string H5FED_D_COORD3D        (H5FED_G_COORD+"/COORD3D");
-const std::string H5FED_D_TETMESH        (H5FED_G_VOLUME_MESH+"/TETMESH_L");
-const std::string H5FED_D_HEXMESH        (H5FED_G_VOLUME_MESH+"/HEXMESH_L");
-const std::string H5FED_D_PRISMATICMESH  (H5FED_G_VOLUME_MESH+"/PRISMATICMESH_L");
-const std::string H5FED_D_PYRAMIDMESH    (H5FED_G_VOLUME_MESH+"/PYRAMIDMESH_L");
-const std::string H5FED_D_TRIANGLEMESH   (H5FED_G_VOLUME_MESH+"/TRIANGLEMESH_L");
-const std::string H5FED_D_QUADRANGLEMESH (H5FED_G_VOLUME_MESH+"/QUADRANGLEMESH_L");
-const std::string H5FED_D_TRIANGLEBOUNDARY (H5FED_G_BOUNDARY_MESH+"/BOUNDARY_TRIANGLE_L");
+const std::string HDF5FED_D_COORD3D  (HDF5FED_G_COORD+"/COORD3D");
+const std::string HDF5FED_D_TETMESH  (HDF5FED_G_VOLUME_MESH+"/TETMESH_L");
+const std::string HDF5FED_D_HEXMESH  (HDF5FED_G_VOLUME_MESH+"/HEXMESH_L");
+const std::string HDF5FED_D_PRISMATICMESH 
+                    (HDF5FED_G_VOLUME_MESH+"/PRISMATICMESH_L");
+const std::string HDF5FED_D_PYRAMIDMESH
+                    (HDF5FED_G_VOLUME_MESH+"/PYRAMIDMESH_L");
+const std::string HDF5FED_D_TRIANGLEMESH
+                    (HDF5FED_G_VOLUME_MESH+"/TRIANGLEMESH_L");
+const std::string HDF5FED_D_QUADRANGLEMESH 
+                    (HDF5FED_G_VOLUME_MESH+"/QUADRANGLEMESH_L");
+const std::string HDF5FED_D_TRIANGLEBOUNDARY 
+                    (HDF5FED_G_BOUNDARY_MESH+"/BOUNDARY_TRIANGLE_L");
 
 // How much nodes have a geometric figure. 
-const unsigned short int H5FED_TET_N_NODE        = 4;
-const unsigned short int H5FED_HEX_N_NODE        = 8;
-const unsigned short int H5FED_PRISMATIC_N_NODE  = 6;
-const unsigned short int H5FED_PYRAMID_N_NODE    = 5;
-const unsigned short int H5FED_TRIANGLE_N_NODE   = 3;
-const unsigned short int H5FED_QUADRANGLE_N_NODE = 4;
+const unsigned short int HDF5FED_TET_N_NODE        = 4;
+const unsigned short int HDF5FED_HEX_N_NODE        = 8;
+const unsigned short int HDF5FED_PRISMATIC_N_NODE  = 6;
+const unsigned short int HDF5FED_PYRAMID_N_NODE    = 5;
+const unsigned short int HDF5FED_TRIANGLE_N_NODE   = 3;
+const unsigned short int HDF5FED_QUADRANGLE_N_NODE = 4;
 
 // In which format should a single element of a mesh entity and the
 // index to the material list be stored.
-const hid_t H5FED_MESH_ELEM_DATATYPE = H5T_STD_U32LE;
-const hid_t H5FED_COORD_DATATYPE = H5T_IEEE_F64LE;
+const hid_t HDF5FED_MESH_ELEM_DATATYPE = H5T_STD_U32LE;
+const hid_t HDF5FED_COORD_DATATYPE     = H5T_IEEE_F64LE;
 
 
 } /* namespace H5Fed*/
-#endif /*H5FEDCONST_HH_*/
+#endif /*HDF5FEDCONST_HH_*/

Hdf5fed/libsrc/hdf5fed/makefile.am

@@ -10,6 +10,6 @@
 noinst_LTLIBRARIES = libhdf5fed.la
 hdf5feddir = $(topleveldir)/libsrc/hdf5fed
 hdf5fed_HEADERS = hdf5fed.hh              
-libh5fed_la_SOURCES = hdf5fed.cc \
-                      hdf5fed.hh
+libhdf5fed_la_SOURCES = hdf5fed.cc \
+                        hdf5fed.hh
 AM_CPPFLAGS = @AM_CPPFLAGS@