1 files changed, 27 insertions, 34 deletions

diff --git a/CarpetDev/CarpetIOF5/src/file.hh b/CarpetDev/CarpetIOF5/src/file.hh
index 19add249e..44d8ce00c 100644
--- a/CarpetDev/CarpetIOF5/src/file.hh
+++ b/CarpetDev/CarpetIOF5/src/file.hh
@@ -23,48 +23,46 @@ namespace CarpetIOF5 {
     
     class file_t {
       
-      cGH const * const m_cctkGH;
+      // File mode for creating directories
+      static int const mode = 0755;
       
-      bool m_have_metafile;
-      int m_output_processor;
+      cGH const * const m_cctkGH;
       
+      string const m_path;
       string const m_basename;
       string const m_extension;
-      
-      string m_metafilename;
       string m_filename;
       
-      vector <string> mutable m_filenames;
+      bool const m_is_metafile;
+      bool const m_is_datafile;
       
-      hid_t m_hdf5_metafile;
       hid_t m_hdf5_file;
       
+      hid_t m_hdf5_fiber_contents;
+      hid_t m_hdf5_fiber_global_charts;
+      hid_t m_hdf5_fiber_parameter_space;
+      
       file_t ();
       file_t (file_t const &);
       file_t operator= (file_t const &);
       
-      bool
-      determine_want_metafile (int proc)
-        const;
-      
-      int
-      determine_output_processor (int proc)
-        const;
-      
       string
-      make_metafilename ()
+      create_filename (int proc,
+                       bool create_directories = false)
         const;
       
-      string
-      make_filename (int proc)
-        const;
+      static void
+      create_or_check_version (hid_t const hdf5_file);
       
     public:
       
       file_t (cGH const * cctkGH,
-              string filename,
+              string path,
+              string basename,
               string extension,
-              bool do_truncate);
+              bool do_truncate,
+              bool is_metafile,
+              bool is_datafile);
       
       virtual
       ~ file_t ();
@@ -73,28 +71,23 @@ namespace CarpetIOF5 {
       get_cctkGH ()
         const;
       
-      bool
-      get_have_metafile ()
-        const;
-      
-      int
-      get_output_processor ()
+      hid_t
+      get_hdf5_file ()
         const;
       
-      string
-      get_filename (int proc)
+      hid_t
+      get_hdf5_fiber_parameter_space ()
         const;
       
-      hid_t
-      get_hdf5_metafile ()
+      bool get_is_metafile ()
         const;
       
-      hid_t
-      get_hdf5_file ()
+      bool get_is_datafile ()
         const;
       
       void
-      get_link_destination (string & filename,
+      get_link_destination (int proc,
+                            string & filename,
                             string & objectname)
         const;