Skip to content
Snippets Groups Projects
Commit 384b7895 authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

Merge branch 'feature/field-rseed' into develop

parents f159288e 8293c615
No related branches found
No related tags found
1 merge request!45Develop
Pipeline #136636 failed
...@@ -161,6 +161,8 @@ class DNS(_code): ...@@ -161,6 +161,8 @@ class DNS(_code):
self.parameter_description['max_velocity_estimate'] = 'During statistics, velocity histogram bins are computed using this estimate (see code for details).' self.parameter_description['max_velocity_estimate'] = 'During statistics, velocity histogram bins are computed using this estimate (see code for details).'
self.parameters['max_vorticity_estimate'] = float(1) self.parameters['max_vorticity_estimate'] = float(1)
self.parameter_description['max_velocity_estimate'] = 'During statistics, vorticity histogram bins are computed using this estimate (see code for details).' self.parameter_description['max_velocity_estimate'] = 'During statistics, vorticity histogram bins are computed using this estimate (see code for details).'
self.parameters['field_random_seed'] = int(1)
self.parameter_description['field_random_seed'] = 'Seed for random number generator used for initial field.'
# parameters specific to particle version # parameters specific to particle version
self.NSVEp_extra_parameters = {} self.NSVEp_extra_parameters = {}
self.NSVEp_extra_parameters['niter_part'] = int(1) self.NSVEp_extra_parameters['niter_part'] = int(1)
...@@ -187,7 +189,6 @@ class DNS(_code): ...@@ -187,7 +189,6 @@ class DNS(_code):
self.extra_parameters[kk] = {} self.extra_parameters[kk] = {}
self.extra_parameters['kraichnan_field'].update({ self.extra_parameters['kraichnan_field'].update({
'output_velocity': int(1), 'output_velocity': int(1),
'field_random_seed': int(1),
'spectrum_dissipation': float(0.027), 'spectrum_dissipation': float(0.027),
'spectrum_Lint': float(1.3), 'spectrum_Lint': float(1.3),
'spectrum_etaK': float(0.3), 'spectrum_etaK': float(0.3),
...@@ -1155,11 +1156,13 @@ class DNS(_code): ...@@ -1155,11 +1156,13 @@ class DNS(_code):
data = self.generate_vector_field( data = self.generate_vector_field(
write_to_file = False, write_to_file = False,
spectra_slope = 2.0, spectra_slope = 2.0,
rseed = self.parameters['field_random_seed'],
amplitude = self.parameters['initial_field_amplitude']) amplitude = self.parameters['initial_field_amplitude'])
else: else:
data = self.generate_vector_field( data = self.generate_vector_field(
write_to_file = False, write_to_file = False,
spectra_slope = 2.0, spectra_slope = 2.0,
rseed = self.parameters['field_random_seed'],
amplitude = 0.05) amplitude = 0.05)
f[checkpoint_field + '/complex/{0}'.format(0)] = data f[checkpoint_field + '/complex/{0}'.format(0)] = data
f.close() f.close()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment