From 76cd22868102d9b04a83f5d2666bc471788f44e3 Mon Sep 17 00:00:00 2001 From: Jordan Mirocha Date: Tue, 5 Sep 2017 14:35:06 -0700 Subject: [PATCH] minor fix in ModelSet data i/o --- ares/analysis/BlobFactory.py | 2 ++ ares/analysis/ModelSet.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ares/analysis/BlobFactory.py b/ares/analysis/BlobFactory.py index 15293f1eb..a4dcd2487 100755 --- a/ares/analysis/BlobFactory.py +++ b/ares/analysis/BlobFactory.py @@ -627,6 +627,8 @@ def _get_item(self, name): % (self.prefix, ddid, nd, name) ddf.append(tmp) + print ddf + # Start with the first... fn = ddf[0] diff --git a/ares/analysis/ModelSet.py b/ares/analysis/ModelSet.py index 55e3773a5..778630ff2 100755 --- a/ares/analysis/ModelSet.py +++ b/ares/analysis/ModelSet.py @@ -3936,7 +3936,7 @@ def get_blob(self, name, ivar=None): i, j, nd, dims = self.blob_info(name) if (i is None) and (j is None): - f = h5py.File('%s.hdf5' % self.fn, 'r') + f = h5py.File('%s.hdf5' % self.prefix, 'r') return f['blobs'][name].value blob = self.get_blob_from_disk(name) @@ -4008,9 +4008,9 @@ def DeriveBlob(self, func=None, fields=None, expr=None, varmap=None, Relates variables in `expr` to blobs. For example, varmap = {'x': 'nu_D', 'y': 'nu_C'} - + The remaining parameters are: - + save : bool Save to disk? If not, just returns array. name : str @@ -4019,7 +4019,7 @@ def DeriveBlob(self, func=None, fields=None, expr=None, varmap=None, clobber : bool If file with same ``name`` exists, overwrite it? - """ + """ if func is not None: data = self.ExtractData(fields)