Skip to content
Snippets Groups Projects
Commit 1ab45f84 authored by Pierre Augier's avatar Pierre Augier
Browse files

Add a sub_directory parameter and improve simul name for plate2d.

parent 1815677d
No related branches found
No related tags found
No related merge requests found
......@@ -65,7 +65,8 @@
"""
attribs = {'period_refresh_plots': 1,
'ONLINE_PLOT_OK': True,
'HAS_TO_SAVE': True}
'HAS_TO_SAVE': True,
'sub_directory': ''}
params._set_child('output', attribs=attribs)
params.output._set_child('periods_save')
......@@ -133,6 +134,5 @@
if params.NEW_DIR_RESULTS:
if FLUIDDYN_PATH_SCRATCH is not None:
self.path_run = os.path.join(
FLUIDDYN_PATH_SCRATCH, self.sim.name_run)
path_base = FLUIDDYN_PATH_SCRATCH
else:
......@@ -138,6 +138,11 @@
else:
self.path_run = os.path.join(
FLUIDDYN_PATH_SIM, self.sim.name_run)
path_base = FLUIDDYN_PATH_SIM
if len(params.output.sub_directory) > 0:
path_base = os.path.join(
path_base, params.output.sub_directory)
self.path_run = os.path.join(path_base, self.sim.name_run)
if mpi.rank == 0:
params._set_attrib('path_run', self.path_run)
......
......@@ -128,6 +128,8 @@
# 'Proportional'
# params.forcing.type_normalize
params.output.sub_directory = 'tests'
# params.output.periods_print.print_stdout = 0.25
params.output.periods_save.phys_fields = 1.
......
......@@ -69,6 +69,17 @@
params.output.phys_fields.field_to_plot = 'z'
def create_list_for_name_run(self):
list_for_name_run = super(Output, self).create_list_for_name_run()
if self.sim.params.FORCING:
str_P = ('P={:5.0e}'.format(self.sim.params.forcing.forcing_rate))
str_P = str_P.replace('+', '')
list_for_name_run.insert(2, str_P)
return list_for_name_run
def compute_energies_conversion_fft(self):
w_fft = self.sim.state.compute('w_fft')
z_fft = self.sim.state.compute('z_fft')
......
......@@ -267,7 +267,7 @@
params.short_name_type_run = 'test'
nh = 192/2
nh = 96
Lh = 1.
params.oper.nx = nh
params.oper.ny = nh
......@@ -276,11 +276,10 @@
params.oper.coef_dealiasing = 2./3
delta_x = Lh/nh
params.nu_8 = 2.*10e3*params.forcing.forcing_rate**(1./3)*delta_x**8
# params.nu_m4 = -1.5e7
params.nu_8 = 2e1*params.forcing.forcing_rate**(1./3)*delta_x**8
kmax = np.sqrt(2)*np.pi/delta_x
deltat = 2*np.pi/kmax**2/2
params.time_stepping.USE_CFL = False
params.time_stepping.deltat0 = deltat
......@@ -281,12 +280,12 @@
kmax = np.sqrt(2)*np.pi/delta_x
deltat = 2*np.pi/kmax**2/2
params.time_stepping.USE_CFL = False
params.time_stepping.deltat0 = deltat
params.time_stepping.USE_T_END = True
params.time_stepping.t_end = 4.
params.time_stepping.it_end = 1
params.time_stepping.USE_T_END = False
params.time_stepping.t_end = 1.
params.time_stepping.it_end = 10
params.init_fields.type = 'noise'
params.init_fields.noise.velo_max = 1e-6
......@@ -294,9 +293,9 @@
params.FORCING = True
params.forcing.type = 'random'
params.forcing.forcing_rate = 1e4
params.forcing.nkmax_forcing = 6
params.forcing.nkmin_forcing = 3
params.forcing.forcing_rate = 1e12
params.forcing.nkmax_forcing = 5
params.forcing.nkmin_forcing = 2
params.forcing.random.time_correlation = 100*deltat
params.output.periods_print.print_stdout = 0.05
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment