noe/pipeline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepare refactoring

Browse Source
This commit is contained in:
Noe Brucy
2020-04-01 09:17:19 +02:00
parent b8f85b1386
commit 77676ec9a4
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
postprocessor.py
+12 -2
View File
@@ -245,7 +245,11 @@ class PostProcessor(HDF5Container):
else:
df["value"] = value
if self.pp_params.process.unload_cells:
self.unload_cells()
df.sort_values("axis", inplace=True)
return df.groupby("axis").mean().values[:, 0]
def _vol_avg(self, getter, mass_weighted=True):
@@ -254,9 +258,13 @@ class PostProcessor(HDF5Container):
if mass_weighted:
mass = mass_func(self.cells)
# Transpose (.T) is for vectorial values
return np.sum((mass * value.T).T, axis=0) / np.sum(mass)
data = np.sum((mass * value.T).T, axis=0) / np.sum(mass)
else:
return np.sum(value, axis=0)
data = np.sum(value, axis=0)
if self.pp_params.process.unload_cells:
self.unload_cells()
return data
def _vol_pdf(self, getter, bins=100, logbins=False, weight_func=vol_func):
self.load_cells()
@@ -264,6 +272,8 @@ class PostProcessor(HDF5Container):
if logbins:
data = np.log10(data)
weights = weight_func(self.cells)
if self.pp_params.process.unload_cells:
self.unload_cells()
values, edges = np.histogram(data, bins, weights=weights)
centers = 0.5 * (edges[1:] + edges[:-1])