From c9b19444930d7ea9a9f6db6cf1d15535f7c459d9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 24 Nov 2019 08:50:27 +0100 Subject: [PATCH] handling of derived datatypes/structs currently required for orientation --- processing/post/DADF5_postResults.py | 4 ++-- python/damask/dadf5.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/processing/post/DADF5_postResults.py b/processing/post/DADF5_postResults.py index 0db018173..a16ef147c 100755 --- a/processing/post/DADF5_postResults.py +++ b/processing/post/DADF5_postResults.py @@ -65,7 +65,7 @@ for filename in options.filenames: x = results.get_dataset_location(label) if len(x) == 0: continue - array = results.read_dataset(x,0) + array = results.read_dataset(x,0,plain=True) d = int(np.product(np.shape(array)[1:])) data = np.concatenate((data,np.reshape(array,[np.product(results.grid),d])),1) @@ -80,7 +80,7 @@ for filename in options.filenames: x = results.get_dataset_location(label) if len(x) == 0: continue - array = results.read_dataset(x,0) + array = results.read_dataset(x,0,plain=True) d = int(np.product(np.shape(array)[1:])) data = np.concatenate((data,np.reshape(array,[np.product(results.grid),d])),1) diff --git a/python/damask/dadf5.py b/python/damask/dadf5.py index 84168cd94..69b19fefd 100644 --- a/python/damask/dadf5.py +++ b/python/damask/dadf5.py @@ -369,7 +369,7 @@ class DADF5(): return f[self.get_dataset_location('orientation')[0]].attrs['Lattice'].astype('str') # np.bytes_ to string - def read_dataset(self,path,c=0): + def read_dataset(self,path,c=0,plain=False): """ Dataset for all points/cells. @@ -402,7 +402,7 @@ class DADF5(): a=a.reshape([a.shape[0],1]) dataset[p,:] = a[u,:] - return dataset + return dataset if not plain else dataset.view(('float64',len(dataset.dtype.names))) def cell_coordinates(self):