Reading and writing of HDF5 files re-introduced.

Removed template for FieldMetadata. Uses plain virtual callback member function instead.
Field3DOutputFile now has useOgawa() option to fall back to plain HDF5 files.
Field3DInputFile will now call out to Field3DInputFileHDF5 to support both formats.
Cleaned up the public interface of Field3D{In,Out}putFile.

Author: magnusw

export/Field.h

@@ -88,7 +88,7 @@ DECLARE_FIELD3D_GENERIC_EXCEPTION(ResizeException, Exception)
   for the metadata map
 */
 
-class FIELD3D_API FieldBase : public RefBase
+class FIELD3D_API FieldBase : public RefBase, public MetadataCallback
 {
 public:
 
@@ -152,18 +152,13 @@ class FIELD3D_API FieldBase : public RefBase
   //! \{
 
   //! accessor to the m_metadata class
-  FieldMetadata<FieldBase>& metadata()
+  FieldMetadata& metadata()
   { return m_metadata; }
 
   //! Read only access to the m_metadata class
-  const FieldMetadata<FieldBase>& metadata() const
+  const FieldMetadata& metadata() const
   { return m_metadata; }
 
-  //! This function should implemented by concrete classes to  
-  //! get the callback when metadata changes
-  virtual void metadataHasChanged(const std::string &/* name */) 
-  { /* Empty */ }
-
   //! Copies the metadata from a second field
   void copyMetadata(const FieldBase &field)
   { m_metadata = field.metadata(); }
@@ -182,7 +177,7 @@ class FIELD3D_API FieldBase : public RefBase
   // Private data members ------------------------------------------------------
 
   //! metadata
-  FieldMetadata<FieldBase> m_metadata;
+  FieldMetadata m_metadata;
 
 };