From e635607dc00323d4081439a4d6b51eec4b2df166 Mon Sep 17 00:00:00 2001
From: Chichi Lalescu <clalesc1@jhu.edu>
Date: Sat, 14 Nov 2015 13:15:57 +0100
Subject: [PATCH] only do trS2_Q_R stats if the data is there
---
bfps/NavierStokes.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/bfps/NavierStokes.py b/bfps/NavierStokes.py
index 4342f0a9..1a1780e4 100644
--- a/bfps/NavierStokes.py
+++ b/bfps/NavierStokes.py
@@ -554,21 +554,24 @@ class NavierStokes(bfps.fluid_base.fluid_particle_base):
data_file['statistics/spectra/vorticity_vorticity'][ii0:ii1+1, :, 2, 2])/2
data_file['postprocess/vel_max(t)'] = data_file['statistics/moments/velocity'] [ii0:ii1+1, 9, 3]
data_file['postprocess/renergy(t)'] = data_file['statistics/moments/velocity'][ii0:ii1+1, 2, 3]/2
- data_file['postprocess/mean_trS2(t)'] = data_file['statistics/moments/trS2_Q_R'][:, 1, 0]
+ if 'trS2_Q_R' in data_file['statistics/moments'].keys():
+ data_file['postprocess/mean_trS2(t)'] = data_file['statistics/moments/trS2_Q_R'][:, 1, 0]
for k in ['t',
'energy(t, k)',
'enstrophy(t, k)',
'vel_max(t)',
'renergy(t)',
'mean_trS2(t)']:
- self.statistics[k] = data_file['postprocess/' + k].value
+ if key in data_file['postprocess'].keys():
+ self.statistics[k] = data_file['postprocess/' + k].value
self.compute_time_averages()
return None
def compute_time_averages(self):
for key in ['energy', 'enstrophy']:
self.statistics[key + '(t)'] = np.sum(self.statistics[key + '(t, k)'], axis = 1)
for key in ['energy', 'enstrophy', 'vel_max', 'mean_trS2']:
- self.statistics[key] = np.average(self.statistics[key + '(t)'], axis = 0)
+ if key + '(t)' in self.statistics.keys():
+ self.statistics[key] = np.average(self.statistics[key + '(t)'], axis = 0)
for suffix in ['', '(t)']:
self.statistics['diss' + suffix] = (self.parameters['nu'] *
self.statistics['enstrophy' + suffix]*2)
--
GitLab